From a15b532a02094b3afe9d698f6b98e70f0fd4506a Mon Sep 17 00:00:00 2001 From: artoo Date: Thu, 13 Dec 2018 11:55:25 +0100 Subject: scripts: fix halt, poweroff and reboot wrappers These are designed to emulate the sysvinit equivalents, so pass "now" as the time argument if no arguments are given. This fixes #268. --- scripts/halt.in | 7 ++++++- scripts/poweroff.in | 7 ++++++- scripts/reboot.in | 7 ++++++- 3 files changed, 18 insertions(+), 3 deletions(-) diff --git a/scripts/halt.in b/scripts/halt.in index 70e93662..209dc130 100644 --- a/scripts/halt.in +++ b/scripts/halt.in @@ -21,4 +21,9 @@ if [ -z "${poweroff_arg}" ]; then poweroff_arg=--poweroff fi -exec @SBINDIR@/openrc-shutdown ${option_arg} ${poweroff_arg} "$@" +script_args="$@" +if [ -z "${script_args}" ]; then + script_args=now +fi + +exec @SBINDIR@/openrc-shutdown ${option_arg} ${poweroff_arg} "${script_args}" diff --git a/scripts/poweroff.in b/scripts/poweroff.in index 1c260d32..4e944bdc 100644 --- a/scripts/poweroff.in +++ b/scripts/poweroff.in @@ -20,4 +20,9 @@ if [ -z "${poweroff_arg}" ]; then poweroff_arg=--poweroff fi -exec @SBINDIR@/openrc-shutdown ${option_arg} ${poweroff_arg} "$@" +script_args="$@" +if [ -z "${script_args}" ]; then + script_args=now +fi + +exec @SBINDIR@/openrc-shutdown ${option_arg} ${poweroff_arg} "${script_args}" diff --git a/scripts/reboot.in b/scripts/reboot.in index 60251d8c..bf50967a 100644 --- a/scripts/reboot.in +++ b/scripts/reboot.in @@ -22,4 +22,9 @@ if [ -z "${poweroff_arg}" ]; then poweroff_arg=--reboot fi -exec @SBINDIR@/openrc-shutdown ${option_arg} ${poweroff_arg} "$@" +script_args="$@" +if [ -z "${script_args}" ]; then + script_args=now +fi + +exec @SBINDIR@/openrc-shutdown ${option_arg} ${poweroff_arg} "${script_args}" -- cgit v1.2.3