[gentoo-commits] repo/gentoo:master commit in: sys-apps/sysvinit/files/

[gentoo-commits] repo/gentoo:master commit in: sys-apps/sysvinit/files/

[Lars Wendler]

commit:     f2476df5f80bbdd85109d7df0d3a070ab48bc1de
Author:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Fri Nov 23 21:47:09 2018 +0000
Commit:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Fri Nov 23 21:47:22 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f2476df5

sys-apps/sysvinit: Improved shutdown_h patch.

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

 .../files/sysvinit-2.92_beta-shutdown-h.patch        | 20 +++++++++++++++-----
 1 file changed, 15 insertions(+), 5 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
index cf8786ac4a2..e53a9208c6d 100644
--- 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 @@
    		}
  	}
  

[gentoo-commits] repo/gentoo:master commit in: sys-apps/sysvinit/files/

[Lars Wendler]

commit:     225333417b72b34a592672d9b5d3f0ce01df578a
Author:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Mon Aug 19 08:22:50 2019 +0000
Commit:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Mon Aug 19 08:23:05 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=22533341

sys-apps/sysvinit: Minor cosmetic change to halt.sh

Package-Manager: Portage-2.3.72, Repoman-2.3.17
Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org>

 sys-apps/sysvinit/files/halt.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys-apps/sysvinit/files/halt.sh b/sys-apps/sysvinit/files/halt.sh
index 07a32b99574..ff68c425cd4 100644
--- a/sys-apps/sysvinit/files/halt.sh
+++ b/sys-apps/sysvinit/files/halt.sh
@@ -1,5 +1,5 @@
 #!/bin/sh
-if [ "$INIT_HALT" = HALT ]; then
+if [ "${INIT_HALT}" = HALT ]; then
 	exec /sbin/halt -dhn
 else
 	exec /sbin/poweroff -dhn