[Pkg-sysvinit-devel] Bug#630661: further notifications about shutdown flags that can only be used along with -h flag.

[Regid Ichira]

Source: sysvinit
Version: 2.88dsf-13.10
Severity: normal
Tags: patch

  Please further notify about shutdown flags that can only be used along with -h
flag.

--- man/shutdown.8      2010-03-23 16:37:01.000000000 +0200
+++ man/shutdown.8.new  2011-06-16 03:24:25.000000000 +0300
@@ -70,7 +70,8 @@
 .\"}}}
 .\"{{{  -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


In addition, removes the obsolete usage comment at the beginning of 
src/shutdown.c

--- src/shutdown.c      2011-06-16 03:21:58.000000000 +0300
+++ src/shutdown.c.new  2011-06-16 03:21:08.000000000 +0300
@@ -1,15 +1,7 @@
 /*
  * shutdown.c  Shut the system down.
  *
- * Usage:      shutdown [-krhfnc] time [warning message]
- *               -k: don't really shutdown, only warn.
- *               -r: reboot after shutdown.
- *               -h: halt after shutdown.
- *               -f: do a 'fast' reboot (skip fsck).
- *               -F: Force fsck on reboot.
- *               -n: do not go through init but do it ourselves.
- *               -c: cancel an already running shutdown.
- *               -t secs: delay between SIGTERM and SIGKILL for init.
+ * Usage:      See the usage function in this file.
  *
  * Author:     Miquel van Smoorenburg, miquels at cistron.nl
  *
@@ -124,12 +116,15 @@
 {
        fprintf(stderr,
        "Usage:\t  shutdown [-akrhPHfFnc] [-t sec] time [warning message]\n"
+       "      \t           -H and -P flags can only be used along with -h fl
ag.\n"
        "\t\t  -a:      use /etc/shutdown.allow\n"
        "\t\t  -k:      don't really shutdown, only warn.\n"
        "\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  -H:      halt action is to just halt.\n"
+       "\t\t\t-P:      halt action is to turn off power.\n"
+       "\t\t\t         can only be used along with -h flag.\n"
+       "\t\t\t-H:      halt action is to just halt.\n"
+       "\t\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"