forge/pmaports
1
0
Fork 0
Code Issues 2 Pull requests Projects Releases Packages Wiki Activity Actions

main/postmarketos-mkinitfs-hook-debug-shell: fixes (MR 4204)

Browse source 
Some change (I think some tools switching from the coreutils to busybox
versions?) subtly broke debug-shell behaviour. Try to fix it.

Signed-off-by: Caleb Connolly <caleb@connolly.tech>
[ci:skip-build]: already built successfully in CI
This commit is contained in:
Caleb Connolly 2023-08-21 17:39:02 +01:00 committed by Pablo Correa Gómez
parent 9198a2ad6e
commit 16bf9c9700
No known key found for this signature in database
GPG key ID: 7A342565FF635F79
2 changed files with 4 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
main/postmarketos-mkinitfs-hook-debug-shell/20-debug-shell.sh
View file

@ -12,7 +12,7 @@ show_splash "WARNING: debug-shell is active\\nhttps://postmarketos.org/debug-she
echo "Create 'pmos_continue_boot' script" echo "Create 'pmos_continue_boot' script"
{ {
echo "#!/bin/sh" echo "#!/bin/sh"
echo "pkill -f pmos_shell" echo "pkill -9 -f pmos_shell"
echo "pkill -f pmos_loop_forever" echo "pkill -f pmos_loop_forever"
echo "pkill -f telnetd.*:${TELNET_PORT}" echo "pkill -f telnetd.*:${TELNET_PORT}"
} >/usr/bin/pmos_continue_boot } >/usr/bin/pmos_continue_boot
@ -59,13 +59,7 @@ echo "This is a security hole! Only use it for debugging, and"
echo "uninstall the debug-shell hook afterwards!" echo "uninstall the debug-shell hook afterwards!"
echo "---" echo "---"
if tty -s; then pmos_shell
echo "Exit the shell to continue booting:"
pmos_shell
else
echo "No tty attached, looping forever."
pmos_loop_forever
fi
# Show "Loading" splash again when continuing # Show "Loading" splash again when continuing
show_splash "Loading..." show_splash "Loading..."

4
main/postmarketos-mkinitfs-hook-debug-shell/APKBUILD
View file

@ -1,5 +1,5 @@
pkgname=postmarketos-mkinitfs-hook-debug-shell pkgname=postmarketos-mkinitfs-hook-debug-shell
pkgver=0.4.6 pkgver=0.4.7
pkgrel=0 pkgrel=0
pkgdesc="Root shell in the initramfs (security hole, for debugging only)" pkgdesc="Root shell in the initramfs (security hole, for debugging only)"
url="https://postmarketos.org" url="https://postmarketos.org"
@ -17,6 +17,6 @@ package() {
} }
sha512sums=" sha512sums="
0afe6aebeef653f7d61d37f69814df3ddb690a14f2c9326f02eabfcfb46aa168c45bd89e31145a6857f3641a89671d9e19d491065b5900300281af7208ca0efc 20-debug-shell.sh 42ef2f0a1089bba9cbe094b346b68df62b9499de0e6193e4d19bc0c491b2bc2ae14399908fd1371dd9111261fca0df4526f7dc13e7c861834b01fc03a3ed5fc4 20-debug-shell.sh
845d2eb6ab72c5c1472d65305241ca21dbc26784684e9ae99a180a255f8f7f62123b363d73c642df1f9687106340078311a68a76c123f16829b941bff9151735 20-debug-shell.files 845d2eb6ab72c5c1472d65305241ca21dbc26784684e9ae99a180a255f8f7f62123b363d73c642df1f9687106340078311a68a76c123f16829b941bff9151735 20-debug-shell.files
" "