| 1 |
commit: f2476df5f80bbdd85109d7df0d3a070ab48bc1de |
| 2 |
Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Fri Nov 23 21:47:09 2018 +0000 |
| 4 |
Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Fri Nov 23 21:47:22 2018 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f2476df5 |
| 7 |
|
| 8 |
sys-apps/sysvinit: Improved shutdown_h patch. |
| 9 |
|
| 10 |
Package-Manager: Portage-2.3.52, Repoman-2.3.12 |
| 11 |
Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org> |
| 12 |
|
| 13 |
.../files/sysvinit-2.92_beta-shutdown-h.patch | 20 +++++++++++++++----- |
| 14 |
1 file changed, 15 insertions(+), 5 deletions(-) |
| 15 |
|
| 16 |
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 |
| 17 |
index cf8786ac4a2..e53a9208c6d 100644 |
| 18 |
--- a/sys-apps/sysvinit/files/sysvinit-2.92_beta-shutdown-h.patch |
| 19 |
+++ b/sys-apps/sysvinit/files/sysvinit-2.92_beta-shutdown-h.patch |
| 20 |
@@ -7,8 +7,8 @@ patch by Doug Goldstein |
| 21 |
|
| 22 |
--- |
| 23 |
man/shutdown.8 | 8 +++----- |
| 24 |
- src/shutdown.c | 10 ++++------ |
| 25 |
- 2 files changed, 7 insertions(+), 11 deletions(-) |
| 26 |
+ src/shutdown.c | 12 ++++-------- |
| 27 |
+ 2 files changed, 7 insertions(+), 13 deletions(-) |
| 28 |
|
| 29 |
--- sysvinit-2.92/man/shutdown.8 |
| 30 |
+++ sysvinit-2.92/man/shutdown.8 |
| 31 |
@@ -35,7 +35,17 @@ patch by Doug Goldstein |
| 32 |
.IP \fB\-f\fP |
| 33 |
--- sysvinit-2.92/src/shutdown.c |
| 34 |
+++ sysvinit-2.92/src/shutdown.c |
| 35 |
-@@ -546,9 +546,11 @@ |
| 36 |
+@@ -135,9 +135,7 @@ |
| 37 |
+ "\t\t -r: reboot after shutdown.\n" |
| 38 |
+ "\t\t -h: halt after shutdown.\n" |
| 39 |
+ "\t\t -P: halt action is to turn off power.\n" |
| 40 |
+- "\t\t can only be used along with -h flag.\n" |
| 41 |
+ "\t\t -H: halt action is to just halt.\n" |
| 42 |
+- "\t\t can only be used along with -h flag.\n" |
| 43 |
+ "\t\t -f: do a 'fast' reboot (skip fsck).\n" |
| 44 |
+ "\t\t -F: Force fsck on reboot.\n" |
| 45 |
+ "\t\t -n: do not go through \"init\" but go down real fast.\n" |
| 46 |
+@@ -546,9 +544,11 @@ |
| 47 |
switch(c) { |
| 48 |
case 'H': |
| 49 |
halttype = "HALT"; |
| 50 |
@@ -47,7 +57,7 @@ patch by Doug Goldstein |
| 51 |
break; |
| 52 |
case 'a': /* Access control. */ |
| 53 |
useacl = 1; |
| 54 |
-@@ -564,6 +566,8 @@ |
| 55 |
+@@ -564,6 +564,8 @@ |
| 56 |
break; |
| 57 |
case 'h': /* Halt after shutdown */ |
| 58 |
down_level[0] = '0'; |
| 59 |
@@ -56,7 +66,7 @@ patch by Doug Goldstein |
| 60 |
break; |
| 61 |
case 'f': /* Don't perform fsck after next boot */ |
| 62 |
fastboot = 1; |
| 63 |
-@@ -603,12 +607,6 @@ |
| 64 |
+@@ -603,12 +605,6 @@ |
| 65 |
} |
| 66 |
} |
Archives