summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJonathan Bauer2020-08-31 17:00:11 +0200
committerJonathan Bauer2020-08-31 17:00:11 +0200
commitc76a67e8a69a3a5fd932d5055ab458bcde24d1bd (patch)
tree267a507324deff1d803dc8abeef3c87d8c45c717
parentbuild-initramfs.sh: core_repo then core_dracut (diff)
downloadsystemd-init-c76a67e8a69a3a5fd932d5055ab458bcde24d1bd.tar.gz
systemd-init-c76a67e8a69a3a5fd932d5055ab458bcde24d1bd.tar.xz
systemd-init-c76a67e8a69a3a5fd932d5055ab458bcde24d1bd.zip
update emergency_shell patch
-rw-r--r--patches/dracut/dracut-lib.sh.patch15
1 files 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