From 7d561ddf5dc824d9c506ef0015af3924faa4f964 Mon Sep 17 00:00:00 2001 From: Michael Janczyk Date: Wed, 30 Oct 2024 17:51:30 +0100 Subject: chore(dracut): Remove unused code in dracut-lib.sh.patch --- patches/dracut/dracut-lib.sh.patch | 82 -------------------------------------- 1 file changed, 82 deletions(-) delete mode 100644 patches/dracut/dracut-lib.sh.patch diff --git a/patches/dracut/dracut-lib.sh.patch b/patches/dracut/dracut-lib.sh.patch deleted file mode 100644 index accc42bc..00000000 --- a/patches/dracut/dracut-lib.sh.patch +++ /dev/null @@ -1,82 +0,0 @@ -diff --git a/modules.d/98dracut-systemd/dracut-emergency.sh b/modules.d/98dracut-systemd/dracut-emergency.sh -index c6637a5c..19fc4948 100755 ---- a/modules.d/98dracut-systemd/dracut-emergency.sh -+++ b/modules.d/98dracut-systemd/dracut-emergency.sh -@@ -42,6 +42,11 @@ else - [ -z "$_emergency_action" ] && _emergency_action=halt - fi - -+if ! getarg splash; then -+ # Enable systemd output again -+ /bin/kill -SIGRTMIN+20 1 -+fi -+ - /bin/rm -f -- /.console_lock - - case "$_emergency_action" in -diff --git a/modules.d/99base/dracut-lib.sh b/modules.d/99base/dracut-lib.sh -index 39609d82..8e28789a 100755 ---- a/modules.d/99base/dracut-lib.sh -+++ b/modules.d/99base/dracut-lib.sh -@@ -945,7 +945,13 @@ _emergency_shell() { - fi - [ -c "$_ctty" ] || _ctty=/dev/tty1 - case "$(/usr/bin/setsid --help 2>&1)" in *--ctty*) CTTY="--ctty" ;; esac -+ : > /.console_lock - setsid $CTTY /bin/sh -i -l 0<> $_ctty 1<> $_ctty 2<> $_ctty -+ rm -f -- /.console_lock -+ if ! getarg splash; then -+ # Enable systemd output again -+ /bin/kill -SIGRTMIN+20 1 -+ fi - fi - } - -@@ -955,6 +961,8 @@ emergency_shell() { - local _rdshell_name="dracut" action="Boot" hook="emergency" - local _emergency_action - -+ [ -e /.console_lock ] && return 0 -+ - if [ "$1" = "-n" ]; then - _rdshell_name=$2 - shift 2 -@@ -964,11 +972,16 @@ emergency_shell() { - hook="shutdown-emergency" - shift 2 - fi -- -- echo -- echo -- warn "$*" -- echo -+ { -+ # clear fbsplash -+ if getarg splash; then -+ echo -en '\033[2J' -+ fi -+ echo "$*" -+ echo -+ } > /dev/tty1 -+ # Disable systemd output -+ /bin/kill -SIGRTMIN+21 1 - - _emergency_action=$(getarg rd.emergency) - [ -z "$_emergency_action" ] \ -@@ -981,6 +994,16 @@ emergency_shell() { - source_hook "$hook" - warn "$action has failed. To debug this issue add \"rd.shell rd.debug\" to the kernel command line." - [ -z "$_emergency_action" ] && _emergency_action=halt -+ local delay=60 -+ { -+ echo "FATAL - contact your bwLehrpool administrator." -+ while [ "$delay" -gt 0 ]; do -+ echo -e "System will ${_emergency_action} in $delay seconds or upon key press."'\e[1A\e[K' -+ (( delay-- )) -+ sleep 1 -+ done & -+ } > /dev/tty1 -+ read -s -t 60 -n 1 bs < /dev/tty1 - fi - - case "$_emergency_action" in -- cgit v1.2.3-55-g7522