From a17f736a42778246c50cc045f7244ced7aedb7f8 Mon Sep 17 00:00:00 2001 From: Jesse Smith Date: Sat, 27 Oct 2018 20:37:47 -0300 Subject: [PATCH] Applied patch from Regid Ichira to clarify shutdown command line options. Updated manual page for shutdown. Closes Debian bug #630661. --- doc/Changelog | 3 +++ man/shutdown.8 | 3 ++- src/shutdown.c | 2 ++ 3 files changed, 7 insertions(+), 1 deletion(-) diff --git a/doc/Changelog b/doc/Changelog index 98a6772..2a7489a 100644 --- a/doc/Changelog +++ b/doc/Changelog @@ -21,6 +21,9 @@ sysvinit (2.92) unreleased; urgency=low avoid locking up if it encounters stopped or zombie processes due to broken NFS mount points. This should allow Debian bug #719273 to be closed. + * Applied patch from Regid Ichira to clarify shutdown command + line options. Updated manual page for shutdown. + Closes Debian bug #630661. sysvinit (2.91) world; urgency=low diff --git a/man/shutdown.8 b/man/shutdown.8 index 6741dec..bf01c41 100644 --- a/man/shutdown.8 +++ b/man/shutdown.8 @@ -70,7 +70,8 @@ Halt or power off after shutdown. .\"}}} .\"{{{ -P .IP \fB\-P\fP -Halt action is to turn off the power. +Modifier to the -h flag. Halt action is to turn off the power. +Must be used with the -h flag. .\"}}} .\"{{{ -H .IP \fB\-H\fP diff --git a/src/shutdown.c b/src/shutdown.c index 7f61e46..26152b2 100644 --- a/src/shutdown.c +++ b/src/shutdown.c @@ -132,7 +132,9 @@ void usage(void) "\t\t -r: reboot after shutdown.\n" "\t\t -h: halt after shutdown.\n" "\t\t -P: halt action is to turn off power.\n" + "\t\t can only be used along with -h flag.\n" "\t\t -H: halt action is to just halt.\n" + "\t\t can only be used along with -h flag.\n" "\t\t -f: do a 'fast' reboot (skip fsck).\n" "\t\t -F: Force fsck on reboot.\n" "\t\t -n: do not go through \"init\" but go down real fast.\n"