gentoo resync : 31.05.2021

2 files changed, 0 insertions, 148 deletions

diff --git a/sys-apps/sysvinit/files/inittab-2.95 b/sys-apps/sysvinit/files/inittab-2.95
deleted file mode 100644
index 03f226a8c3bf..000000000000
--- a/sys-apps/sysvinit/files/inittab-2.95
+++ /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.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 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.95_beta-shutdown-h.patch b/sys-apps/sysvinit/files/sysvinit-2.95_beta-shutdown-h.patch
deleted file mode 100644
index f24e1029ca58..000000000000
--- a/sys-apps/sysvinit/files/sysvinit-2.95_beta-shutdown-h.patch
+++ /dev/null
@@ -1,87 +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 |   11 ++++-------
- src/shutdown.c |   12 ++++--------
- 2 files changed, 8 insertions(+), 15 deletions(-)
-
---- sysvinit-2.95/man/shutdown.8
-+++ sysvinit-2.95/man/shutdown.8
-@@ -66,22 +66,19 @@
- .\"}}}
- .\"{{{  -h
- .IP \fB\-h\fP
--Halt or power off after shutdown. Usually used with the -P or -H flags,
--depending on whether we want to poweroff or simply stop the operating system.
-+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.
-+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.
-+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 -P modifier instead.
-+use the -P option instead.
- .\"}}}
- .\"{{{  -f
- .IP \fB\-f\fP
---- sysvinit-2.95/src/shutdown.c
-+++ sysvinit-2.95/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"
--        "\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"
-@@ -556,9 +554,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;
-@@ -574,6 +574,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;
-@@ -613,12 +615,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) {
-