summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSimon Rettberg2026-04-22 15:30:03 +0200
committerSimon Rettberg2026-04-22 15:30:03 +0200
commitdf453ad71fc65049123102d6e089df157abad414 (patch)
tree233f5efbf7c7aad29bcd5fdff0dfd2b80e4e6d1f
parent[slx-ntfsfree] .service suffix now mandatory in depenendies (diff)
downloadsystemd-init-df453ad71fc65049123102d6e089df157abad414.tar.gz
systemd-init-df453ad71fc65049123102d6e089df157abad414.tar.xz
systemd-init-df453ad71fc65049123102d6e089df157abad414.zip
dracut: Fix: Add missing 60s delay before actual reboot/poweroff
-rw-r--r--patches/dracut/dracut-lib.sh.patch11
1 files changed, 6 insertions, 5 deletions
diff --git a/patches/dracut/dracut-lib.sh.patch b/patches/dracut/dracut-lib.sh.patch
index 09d70689..8deeb3a2 100644
--- a/patches/dracut/dracut-lib.sh.patch
+++ b/patches/dracut/dracut-lib.sh.patch
@@ -15,10 +15,10 @@ index a427a8f7..ce819d87 100755
case "$_emergency_action" in
diff --git a/modules.d/80base/dracut-lib.sh b/modules.d/80base/dracut-lib.sh
-index d44b05cc..18199801 100755
+index 339567d9..256b864e 100755
--- a/modules.d/80base/dracut-lib.sh
+++ b/modules.d/80base/dracut-lib.sh
-@@ -869,7 +869,13 @@ _emergency_shell() {
+@@ -887,7 +887,13 @@ _emergency_shell() {
fi
[ -c "$_ctty" ] || _ctty=/dev/tty1
case "$(/usr/bin/setsid --help 2>&1)" in *--ctty*) CTTY="--ctty" ;; esac
@@ -32,7 +32,7 @@ index d44b05cc..18199801 100755
fi
}
-@@ -879,6 +885,8 @@ emergency_shell() {
+@@ -897,6 +903,8 @@ emergency_shell() {
local _rdshell_name="dracut" action="Boot" hook="emergency"
local _emergency_action
@@ -41,7 +41,7 @@ index d44b05cc..18199801 100755
if [ "$1" = "-n" ]; then
_rdshell_name=$2
shift 2
-@@ -891,8 +899,16 @@ emergency_shell() {
+@@ -909,8 +917,16 @@ emergency_shell() {
echo
echo
@@ -60,7 +60,7 @@ index d44b05cc..18199801 100755
_emergency_action=$(getarg rd.emergency)
[ -z "$_emergency_action" ] \
-@@ -905,6 +921,15 @@ emergency_shell() {
+@@ -923,6 +939,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=poweroff
@@ -73,6 +73,7 @@ index d44b05cc..18199801 100755
+ sleep 1
+ done &
+ } > /dev/tty1
++ read -s -t 60 -n 1 bs < /dev/tty1
fi
case "$_emergency_action" in