sys-apps/sysvinit: Improved shutdown_h patch.

Package-Manager: Portage-2.3.52, Repoman-2.3.12
Signed-off-by: Lars Wendler <polynomial-c@gentoo.org>

diff --git a/sys-apps/sysvinit/files/sysvinit-2.92_beta-shutdown-h.patch b/sys-apps/sysvinit/files/sysvinit-2.92_beta-shutdown-h.patch
index cf8786ac4a238cc00caee98d7037f046c363e8da..e53a9208c6dcd0585006b539607c1bddeefff068 100644 (file)
--- a/sys-apps/sysvinit/files/sysvinit-2.92_beta-shutdown-h.patch
+++ b/sys-apps/sysvinit/files/sysvinit-2.92_beta-shutdown-h.patch
@@ -7,8 +7,8 @@ patch by Doug Goldstein
 
 ---
  man/shutdown.8 |    8 +++-----
- src/shutdown.c |   10 ++++------
- 2 files changed, 7 insertions(+), 11 deletions(-)
+ src/shutdown.c |   12 ++++--------
+ 2 files changed, 7 insertions(+), 13 deletions(-)
 
 --- sysvinit-2.92/man/shutdown.8
 +++ sysvinit-2.92/man/shutdown.8
@@ -35,7 +35,17 @@ patch by Doug Goldstein
  .IP \fB\-f\fP
 --- sysvinit-2.92/src/shutdown.c
 +++ sysvinit-2.92/src/shutdown.c
-@@ -546,9 +546,11 @@
+@@ -135,9 +135,7 @@
+       "\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"
+@@ -546,9 +544,11 @@
                switch(c) {
                        case 'H':
                                halttype = "HALT";
@@ -47,7 +57,7 @@ patch by Doug Goldstein
                                break;
                        case 'a': /* Access control. */
                                useacl = 1;
-@@ -564,6 +566,8 @@
+@@ -564,6 +564,8 @@
                                break;
                        case 'h': /* Halt after shutdown */
                                down_level[0] = '0';
@@ -56,7 +66,7 @@ patch by Doug Goldstein
                                break;
                        case 'f': /* Don't perform fsck after next boot */
                                fastboot = 1;
-@@ -603,12 +607,6 @@
+@@ -603,12 +605,6 @@
                }
        }