From c76a67e8a69a3a5fd932d5055ab458bcde24d1bd Mon Sep 17 00:00:00 2001 From: Jonathan Bauer Date: Mon, 31 Aug 2020 17:00:11 +0200 Subject: update emergency_shell patch --- patches/dracut/dracut-lib.sh.patch | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/patches/dracut/dracut-lib.sh.patch b/patches/dracut/dracut-lib.sh.patch index 25aa93ef..b285a6b0 100644 --- a/patches/dracut/dracut-lib.sh.patch +++ b/patches/dracut/dracut-lib.sh.patch @@ -1,5 +1,5 @@ diff --git a/modules.d/99base/dracut-lib.sh b/modules.d/99base/dracut-lib.sh -index 99cb9dbc..dac642b5 100755 +index 99cb9dbc..af3b62f3 100755 --- a/modules.d/99base/dracut-lib.sh +++ b/modules.d/99base/dracut-lib.sh @@ -1134,10 +1134,14 @@ emergency_shell() @@ -20,15 +20,20 @@ index 99cb9dbc..dac642b5 100755 _emergency_action=$(getarg rd.emergency) [ -z "$_emergency_action" ] \ -@@ -1150,6 +1154,11 @@ emergency_shell() +@@ -1150,6 +1154,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 error - contact your bwLehrpool administrator." -+ echo "Press any key to ${_emergency_action}." ++ 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 -n 1 bs < /dev/tty1 ++ read -s -t 60 -n 1 bs < /dev/tty1 fi case "$_emergency_action" in -- cgit v1.2.3-55-g7522