gentoo resync : 03.03.2021

4 files changed, 22 insertions, 180 deletions

diff --git a/sys-apps/sysvinit/files/inittab-2.91 b/sys-apps/sysvinit/files/inittab-2.91
deleted file mode 100644
index f9ed8d1126a3..000000000000
--- a/sys-apps/sysvinit/files/inittab-2.91
+++ /dev/null
@@ -1,61 +0,0 @@
-#
-# /etc/inittab:  This file describes how the INIT process should set up
-#                the system in a certain run-level.
-#
-# Author:  Miquel van Smoorenburg, <miquels@cistron.nl>
-# Modified by:  Patrick J. Volkerding, <volkerdi@ftp.cdrom.com>
-# Modified by:  Daniel Robbins, <drobbins@gentoo.org>
-# Modified by:  Martin Schlemmer, <azarah@gentoo.org>
-# Modified by:  Mike Frysinger, <vapier@gentoo.org>
-# Modified by:  Robin H. Johnson, <robbat2@gentoo.org>
-# Modified by:  William Hubbs, <williamh@gentoo.org>
-#
-
-# Default runlevel.
-id:3:initdefault:
-
-# System initialization, mount local filesystems, etc.
-si::sysinit:/sbin/openrc sysinit
-
-# Further system initialization, brings up the boot runlevel.
-rc::bootwait:/sbin/openrc boot
-
-l0u:0:wait:/sbin/telinit u
-l0:0:wait:/sbin/openrc shutdown
-l0s:0:wait:/sbin/halt -dhnp
-l1:1:wait:/sbin/openrc single
-l2:2:wait:/sbin/openrc nonetwork
-l3:3:wait:/sbin/openrc default
-l4:4:wait:/sbin/openrc default
-l5:5:wait:/sbin/openrc default
-l6u:6:wait:/sbin/telinit u
-l6:6:wait:/sbin/openrc reboot
-l6r:6:wait:/sbin/reboot -dkn
-#z6:6:respawn:/sbin/sulogin
-
-# new-style single-user
-su0:S:wait:/sbin/openrc single
-su1:S:wait:/sbin/sulogin
-
-# TERMINALS
-#x1:12345:respawn:/sbin/agetty 38400 console linux
-c1:12345:respawn:/sbin/agetty 38400 tty1 linux
-c2:2345:respawn:/sbin/agetty 38400 tty2 linux
-c3:2345:respawn:/sbin/agetty 38400 tty3 linux
-c4:2345:respawn:/sbin/agetty 38400 tty4 linux
-c5:2345:respawn:/sbin/agetty 38400 tty5 linux
-c6:2345:respawn:/sbin/agetty 38400 tty6 linux
-
-# SERIAL CONSOLES
-#s0:12345:respawn:/sbin/agetty -L 9600 ttyS0 vt100
-#s1:12345:respawn:/sbin/agetty -L 9600 ttyS1 vt100
-
-# What to do at the "Three Finger Salute".
-ca:12345:ctrlaltdel:/sbin/shutdown -r now
-
-# Used by /etc/init.d/xdm to control DM startup.
-# Read the comments in /etc/init.d/xdm for more
-# info. Do NOT remove, as this will start nothing
-# extra at boot if /etc/init.d/xdm is not added
-# to the "default" runlevel.
-x:a:once:/etc/X11/startDM.sh
diff --git a/sys-apps/sysvinit/files/inittab-2.98 b/sys-apps/sysvinit/files/inittab-2.98
deleted file mode 100644
index 15a6f2241723..000000000000
--- a/sys-apps/sysvinit/files/inittab-2.98
+++ /dev/null
@@ -1,62 +0,0 @@
-#
-# /etc/inittab:  This file describes how the INIT process should set up
-#                the system in a certain run-level.
-#
-# Author:  Miquel van Smoorenburg, <miquels@cistron.nl>
-# Modified by:  Patrick J. Volkerding, <volkerdi@ftp.cdrom.com>
-# Modified by:  Daniel Robbins, <drobbins@gentoo.org>
-# Modified by:  Martin Schlemmer, <azarah@gentoo.org>
-# Modified by:  Mike Frysinger, <vapier@gentoo.org>
-# Modified by:  Robin H. Johnson, <robbat2@gentoo.org>
-# Modified by:  William Hubbs, <williamh@gentoo.org>
-# Modified by:  Lars Wendler, <polynomial-c@gentoo.org>
-#
-
-# Default runlevel.
-id:3:initdefault:
-
-# System initialization, mount local filesystems, etc.
-si::sysinit:/sbin/openrc sysinit
-
-# Further system initialization, brings up the boot runlevel.
-rc::bootwait:/sbin/openrc boot
-
-l0u:0:wait:/sbin/telinit u
-l0:0:wait:/sbin/openrc shutdown
-l0s:0:wait:/sbin/halt.sh
-l1:1:wait:/sbin/openrc single
-l2:2:wait:/sbin/openrc nonetwork
-l3:3:wait:/sbin/openrc default
-l4:4:wait:/sbin/openrc default
-l5:5:wait:/sbin/openrc default
-l6u:6:wait:/sbin/telinit u
-l6:6:wait:/sbin/openrc reboot
-l6r:6:wait:/sbin/reboot -dkn
-#z6:6:respawn:/sbin/sulogin
-
-# new-style single-user
-su0:S:wait:/sbin/openrc single
-su1:S:wait:/sbin/sulogin
-
-# TERMINALS
-#x1:12345:respawn:/sbin/agetty 38400 console linux
-c1:12345:respawn:/sbin/agetty --noclear 38400 tty1 linux
-c2:2345:respawn:/sbin/agetty 38400 tty2 linux
-c3:2345:respawn:/sbin/agetty 38400 tty3 linux
-c4:2345:respawn:/sbin/agetty 38400 tty4 linux
-c5:2345:respawn:/sbin/agetty 38400 tty5 linux
-c6:2345:respawn:/sbin/agetty 38400 tty6 linux
-
-# SERIAL CONSOLES
-#s0:12345:respawn:/sbin/agetty -L 9600 ttyS0 vt100
-#s1:12345:respawn:/sbin/agetty -L 9600 ttyS1 vt100
-
-# What to do at the "Three Finger Salute".
-ca:12345:ctrlaltdel:/sbin/shutdown -r now
-
-# Used by /etc/init.d/xdm to control DM startup.
-# Read the comments in /etc/init.d/xdm for more
-# info. Do NOT remove, as this will start nothing
-# extra at boot if /etc/init.d/xdm is not added
-# to the "default" runlevel.
-x:a:once:/etc/X11/startDM.sh
diff --git a/sys-apps/sysvinit/files/sysvinit-2.86-shutdown-single.patch b/sys-apps/sysvinit/files/sysvinit-2.86-shutdown-single.patch
deleted file mode 100644
index b8e403f629f7..000000000000
--- a/sys-apps/sysvinit/files/sysvinit-2.86-shutdown-single.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-This patch makes shutdown use the Single User runlevel by default so
-the gettys are shutdown too.
-
-Roy Marples <uberlord@gentoo.org>
-
---- a/man/shutdown.8
-+++ b/man/shutdown.8
-@@ -44,7 +44,7 @@ mail and news processing programs a chance to exit cleanly, etc.
- \fBshutdown\fP does its job by signalling the \fBinit\fP process, 
- asking it to change the runlevel.
- Runlevel \fB0\fP is used to halt the system, runlevel \fB6\fP is used
--to reboot the system, and runlevel \fB1\fP is used to put to system into
-+to reboot the system, and runlevel \fBS\fP is used to put to system into
- a state where administrative tasks can be performed; this is the default
- if neither the \fI-h\fP or \fI-r\fP flag is given to \fBshutdown\fP.
- To see which actions are taken on halt or reboot see the appropriate
---- a/src/shutdown.c
-+++ b/src/shutdown.c
-@@ -506,7 +506,7 @@ int main(int argc, char **argv)
- 		usage();
-   		exit(1);
- 	}
--	strcpy(down_level, "1");
-+	strcpy(down_level, "S");
- 	halttype = NULL;
- 
- 	/* Process the options. */
-@@ -685,6 +685,8 @@ int main(int argc, char **argv)
- 			strcpy(newstate, "for reboot");
- 			break;
- 		case '1':
-+		case 'S':
-+		case 's':
- 			strcpy(newstate, "to maintenance mode");
- 			break;
- 		default:
diff --git a/sys-apps/sysvinit/files/sysvinit-2.92_beta-shutdown-h.patch b/sys-apps/sysvinit/files/sysvinit-2.99-shutdown-h.patch
index e53a9208c6dc..a4ceeda69c5f 100644
--- a/sys-apps/sysvinit/files/sysvinit-2.92_beta-shutdown-h.patch
+++ b/sys-apps/sysvinit/files/sysvinit-2.99-shutdown-h.patch
@@ -5,37 +5,38 @@ 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 @@
+--- sysvinit-2.99/man/shutdown.8
++++ sysvinit-2.99/man/shutdown.8
+@@ -66,22 +66,19 @@
  .\"}}}
  .\"{{{  -h
  .IP \fB\-h\fP
--Halt or power off after shutdown.
-+Equivalent to -P, unless -H is specified.
+-Halt or power off after shutdown. Usually used with the \fI-P\fP or \fI-H\fP flags,
+-depending on whether we want to poweroff or simply stop the operating system.
++Equivalent to \fI-P\fP, unless \fI-H\fP 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. 
+-Modifier to the \fI-h\fP flag. Halt action is to turn off the power. 
+-Must be used with the \fI-h\fP flag.
++Halt 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.
+-Modifier to the \fI-h\fP flag.  Halt action is to halt or drop into boot
+-monitor on systems that support it.  Must be used with the \fI-h\fP flag.
 +Action is to halt or drop into boot monitor on systems that support it.
+ Halting is often used to run through the shutdown process and leave
+ output on the screen for debugging purposes. Or when the user wants the OS to
+ stop, but leave the power on. To power off at the end of the shutdown sequence
+-use the \fI-P\fP modifier instead.
++use the \fI-P\fP option instead.
  .\"}}}
  .\"{{{  -f
  .IP \fB\-f\fP
---- sysvinit-2.92/src/shutdown.c
-+++ sysvinit-2.92/src/shutdown.c
-@@ -135,9 +135,7 @@
+--- sysvinit-2.99/src/shutdown.c
++++ sysvinit-2.99/src/shutdown.c
+@@ -144,9 +144,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"
@@ -45,7 +46,7 @@ patch by Doug Goldstein
  	"\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 @@
+@@ -556,9 +554,11 @@
    		switch(c) {
  			case 'H':
  				halttype = "HALT";
@@ -57,7 +58,7 @@ patch by Doug Goldstein
  				break;
  			case 'a': /* Access control. */
  				useacl = 1;
-@@ -564,6 +564,8 @@
+@@ -574,6 +574,8 @@
    				break;
    			case 'h': /* Halt after shutdown */
  				down_level[0] = '0';
@@ -66,7 +67,7 @@ patch by Doug Goldstein
    				break;
    			case 'f': /* Don't perform fsck after next boot */
    				fastboot = 1;
-@@ -603,12 +605,6 @@
+@@ -613,12 +615,6 @@
    		}
  	}