diff options
author | 2021-02-22 08:56:05 +0100 | |
---|---|---|
committer | 2021-02-22 08:56:17 +0100 | |
commit | 83339c07d8e9bf4d9251375fd7e6b6a6626b69f4 (patch) | |
tree | ea69de96b9f4c4d1574c145e2557a7882f94e165 /sys-apps/sysvinit/files/sysvinit-2.92_beta-shutdown-h.patch | |
parent | sys-apps/sysvinit: Bump to version 2.99 (diff) | |
download | gentoo-83339c07d8e9bf4d9251375fd7e6b6a6626b69f4.tar.gz gentoo-83339c07d8e9bf4d9251375fd7e6b6a6626b69f4.tar.bz2 gentoo-83339c07d8e9bf4d9251375fd7e6b6a6626b69f4.zip |
sys-apps/sysvinit: Removed old
Package-Manager: Portage-3.0.14, Repoman-3.0.2
Signed-off-by: Lars Wendler <polynomial-c@gentoo.org>
Diffstat (limited to 'sys-apps/sysvinit/files/sysvinit-2.92_beta-shutdown-h.patch')
-rw-r--r-- | sys-apps/sysvinit/files/sysvinit-2.92_beta-shutdown-h.patch | 81 |
1 files changed, 0 insertions, 81 deletions
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 deleted file mode 100644 index e53a9208c6dc..000000000000 --- a/sys-apps/sysvinit/files/sysvinit-2.92_beta-shutdown-h.patch +++ /dev/null @@ -1,81 +0,0 @@ -other inits have moved to not requiring the -h flag when used with -H/-P. -modify sysvinit to be the same since it really doesn't matter. - -https://bugs.gentoo.org/449354 - -patch by Doug Goldstein - ---- - man/shutdown.8 | 8 +++----- - src/shutdown.c | 12 ++++-------- - 2 files changed, 7 insertions(+), 13 deletions(-) - ---- sysvinit-2.92/man/shutdown.8 -+++ sysvinit-2.92/man/shutdown.8 -@@ -66,17 +66,15 @@ - .\"}}} - .\"{{{ -h - .IP \fB\-h\fP --Halt or power off after shutdown. -+Equivalent to -P, unless -H is specified. - .\"}}} - .\"{{{ -P - .IP \fB\-P\fP --Modifier to the -h flag. Halt action is to turn off the power. --Must be used with the -h flag. -+Action is to turn off the power. - .\"}}} - .\"{{{ -H - .IP \fB\-H\fP --Modifier to the -h flag. Halt action is to halt or drop into boot --monitor on systems that support it. Must be used with the -h flag. -+Action is to halt or drop into boot monitor on systems that support it. - .\"}}} - .\"{{{ -f - .IP \fB\-f\fP ---- sysvinit-2.92/src/shutdown.c -+++ sysvinit-2.92/src/shutdown.c -@@ -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"; -+ down_level[0] = '0'; - break; - case 'P': - halttype = "POWEROFF"; -+ down_level[0] = '0'; - break; - case 'a': /* Access control. */ - useacl = 1; -@@ -564,6 +564,8 @@ - break; - case 'h': /* Halt after shutdown */ - down_level[0] = '0'; -+ if (!halttype) -+ halttype = "POWEROFF"; - break; - case 'f': /* Don't perform fsck after next boot */ - fastboot = 1; -@@ -603,12 +605,6 @@ - } - } - -- if (NULL != halttype && down_level[0] != '0') { -- fprintf(stderr, "shutdown: -H and -P flags can only be used along with -h flag.\n"); -- usage(); -- exit(1); -- } -- - /* Do we need to use the shutdown.allow file ? */ - if (useacl && (fp = fopen(SDALLOW, "r")) != NULL) { - |