|
Harald Hoyer |
02dec6 |
From 05dc158e3c632cfd5c7fa20aee6e8373191b45fc Mon Sep 17 00:00:00 2001
|
|
Harald Hoyer |
02dec6 |
From: masem <matej.semian@gmail.com>
|
|
Harald Hoyer |
02dec6 |
Date: Wed, 14 Nov 2018 00:48:39 +0100
|
|
Harald Hoyer |
02dec6 |
Subject: [PATCH] Delay argument "-d" requires number
|
|
Harald Hoyer |
02dec6 |
|
|
Harald Hoyer |
02dec6 |
Arguments "-f -d -n" fails with "invalid number -n", because -d delay expects number of seconds.
|
|
Harald Hoyer |
02dec6 |
---
|
|
Harald Hoyer |
02dec6 |
modules.d/99shutdown/shutdown.sh | 6 +++---
|
|
Harald Hoyer |
02dec6 |
1 file changed, 3 insertions(+), 3 deletions(-)
|
|
Harald Hoyer |
02dec6 |
|
|
Harald Hoyer |
02dec6 |
diff --git a/modules.d/99shutdown/shutdown.sh b/modules.d/99shutdown/shutdown.sh
|
|
Harald Hoyer |
02dec6 |
index f21cc811..e3884a88 100755
|
|
Harald Hoyer |
02dec6 |
--- a/modules.d/99shutdown/shutdown.sh
|
|
Harald Hoyer |
02dec6 |
+++ b/modules.d/99shutdown/shutdown.sh
|
|
Harald Hoyer |
02dec6 |
@@ -112,17 +112,17 @@ getarg 'rd.break=shutdown' && emergency_shell --shutdown shutdown "Break before
|
|
Harald Hoyer |
02dec6 |
|
|
Harald Hoyer |
02dec6 |
case "$ACTION" in
|
|
Harald Hoyer |
02dec6 |
reboot|poweroff|halt)
|
|
Harald Hoyer |
02dec6 |
- $ACTION -f -d -n
|
|
Harald Hoyer |
02dec6 |
+ $ACTION -f -n
|
|
Harald Hoyer |
02dec6 |
warn "$ACTION failed!"
|
|
Harald Hoyer |
02dec6 |
;;
|
|
Harald Hoyer |
02dec6 |
kexec)
|
|
Harald Hoyer |
02dec6 |
kexec -e
|
|
Harald Hoyer |
02dec6 |
warn "$ACTION failed!"
|
|
Harald Hoyer |
02dec6 |
- reboot -f -d -n
|
|
Harald Hoyer |
02dec6 |
+ reboot -f -n
|
|
Harald Hoyer |
02dec6 |
;;
|
|
Harald Hoyer |
02dec6 |
*)
|
|
Harald Hoyer |
02dec6 |
warn "Shutdown called with argument '$ACTION'. Rebooting!"
|
|
Harald Hoyer |
02dec6 |
- reboot -f -d -n
|
|
Harald Hoyer |
02dec6 |
+ reboot -f -n
|
|
Harald Hoyer |
02dec6 |
;;
|
|
Harald Hoyer |
02dec6 |
esac
|
|
Harald Hoyer |
02dec6 |
|
|
Harald Hoyer |
02dec6 |
|