From 88abc21167edeb8ff659dea04f3eb4f7142739da Mon Sep 17 00:00:00 2001 From: Daniele Debernardi Date: Thu, 3 Jan 2019 00:31:35 +0100 Subject: [PATCH] debug-shell: Skip fbsplash properly (!124) The show_splash function called by the 20-debug-shell.sh script already skips fbsplash when the device is configured to not use the framebuffer. But the variable was not defined in the script. This is solved by including the /etc/deviceinfo file. Follow-up to !108, where this change got lost in the rebase. --- main/postmarketos-mkinitfs-hook-debug-shell/20-debug-shell.sh | 1 + main/postmarketos-mkinitfs-hook-debug-shell/APKBUILD | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/main/postmarketos-mkinitfs-hook-debug-shell/20-debug-shell.sh b/main/postmarketos-mkinitfs-hook-debug-shell/20-debug-shell.sh index 460c9c103..bc339490b 100644 --- a/main/postmarketos-mkinitfs-hook-debug-shell/20-debug-shell.sh +++ b/main/postmarketos-mkinitfs-hook-debug-shell/20-debug-shell.sh @@ -1,5 +1,6 @@ #!/bin/sh # shellcheck disable=SC1091 +. /etc/deviceinfo . ./init_functions.sh TELNET_PORT=23 diff --git a/main/postmarketos-mkinitfs-hook-debug-shell/APKBUILD b/main/postmarketos-mkinitfs-hook-debug-shell/APKBUILD index afcd7a31b..df71c4664 100644 --- a/main/postmarketos-mkinitfs-hook-debug-shell/APKBUILD +++ b/main/postmarketos-mkinitfs-hook-debug-shell/APKBUILD @@ -1,6 +1,6 @@ pkgname=postmarketos-mkinitfs-hook-debug-shell pkgver=0.1.1 -pkgrel=2 +pkgrel=3 pkgdesc="Root shell in the initramfs (security hole, for debugging only)" url="https://postmarketos.org" depends="postmarketos-mkinitfs fbdebug evtest linuxconsoletools" @@ -17,5 +17,5 @@ package() { "$pkgdir"/etc/postmarketos-mkinitfs/files/20-debug-shell.files } -sha512sums="30df4a3e2f8a82c8c83e80e645fb10516bfae51bc014c28b7d73d48bd0b2f238c186909a0727e5636cf7087aa1e4a348c83a6cf26e99552cea80922d4086627f 20-debug-shell.sh +sha512sums="06e684f0b2ce4766fe7890e0a545ca7e6bc1a03255d2cdf3dd7db6cfda01bf56a21042ac371b54bfe08379ed8c3eebd34a6efa4405595588d2734db0b011e761 20-debug-shell.sh 2761269b5809ed7a1692a26d3e28deea20392d6f5e00fcc209aec8835849b96f791270eb7ad00794cf492d8dda28b940f6d6557b0b764ca46314883a0692d174 20-debug-shell.files"