diff options
author | Sam James <sam@gentoo.org> | 2021-11-20 23:52:23 +0000 |
---|---|---|
committer | Sam James <sam@gentoo.org> | 2021-11-20 23:53:20 +0000 |
commit | 95f23b11ae103b02a2a0d33c7ecd05b9f2809ed4 (patch) | |
tree | 1dc31aeccef778ee62d578da77db30da169beecf /sys-apps | |
parent | sys-libs/pam: treeclean (outdated, already in ::gentoo) (diff) | |
download | musl-95f23b11ae103b02a2a0d33c7ecd05b9f2809ed4.tar.gz musl-95f23b11ae103b02a2a0d33c7ecd05b9f2809ed4.tar.bz2 musl-95f23b11ae103b02a2a0d33c7ecd05b9f2809ed4.zip |
sys-apps/sysvinit: treeclean (outdated, in ::gentoo)
Reported-by: Andreas K. Hüttel <dilfridge@gentoo.org>
Signed-off-by: Sam James <sam@gentoo.org>
Diffstat (limited to 'sys-apps')
-rw-r--r-- | sys-apps/sysvinit/Manifest | 2 | ||||
-rwxr-xr-x | sys-apps/sysvinit/files/bootlogd | 12 | ||||
-rw-r--r-- | sys-apps/sysvinit/files/bootlogd.initd | 8 | ||||
-rw-r--r-- | sys-apps/sysvinit/files/halt.sh | 6 | ||||
-rw-r--r-- | sys-apps/sysvinit/files/inittab-2.91 | 61 | ||||
-rw-r--r-- | sys-apps/sysvinit/files/inittab-2.95 | 61 | ||||
-rw-r--r-- | sys-apps/sysvinit/files/sysvinit-2.86-kexec.patch | 142 | ||||
-rw-r--r-- | sys-apps/sysvinit/files/sysvinit-2.86-shutdown-single.patch | 36 | ||||
-rw-r--r-- | sys-apps/sysvinit/files/sysvinit-2.92_beta-shutdown-h.patch | 81 | ||||
-rw-r--r-- | sys-apps/sysvinit/files/sysvinit-2.94_beta-shutdown-single.patch | 39 | ||||
-rw-r--r-- | sys-apps/sysvinit/files/sysvinit-2.95_beta-shutdown-h.patch | 87 | ||||
-rw-r--r-- | sys-apps/sysvinit/metadata.xml | 12 | ||||
-rw-r--r-- | sys-apps/sysvinit/sysvinit-2.93.ebuild | 123 | ||||
-rw-r--r-- | sys-apps/sysvinit/sysvinit-2.97.ebuild | 147 |
14 files changed, 0 insertions, 817 deletions
diff --git a/sys-apps/sysvinit/Manifest b/sys-apps/sysvinit/Manifest deleted file mode 100644 index 5a1c9f3e..00000000 --- a/sys-apps/sysvinit/Manifest +++ /dev/null @@ -1,2 +0,0 @@ -DIST sysvinit-2.93.tar.xz 117580 BLAKE2B 2e771b00dbdc73e76df9e78659aaa5e5fcbfda36290a1b5aa20a5a6fe3540c4616f2a235a668de30d33c620e2d2516da303537eda47b83b29b0844ad7aa77df4 SHA512 c80d07a674253d15ec6382cfaf792f47486e2e84ab9c913d3c9e03b590cf211177a3a14e168f4d1c9c2e97737221f7ac70a75633d90502837a6d29bdc4c48d72 -DIST sysvinit-2.97.tar.xz 126848 BLAKE2B dd2612de531a89f1fdbfaeb8b5975aeba9541a6b570587a881bdb11406991c1a9b254d1802725298eb13362d625d3859b520ee964782a0fe43d3f038a28b49e6 SHA512 89950080a120b62bdd297f3a59898dd11e10c7438cf18774bad16c65ce5fb2e190726e601c6f263def32cff59867c0984edcd99d527eb80297901085afbb2e90 diff --git a/sys-apps/sysvinit/files/bootlogd b/sys-apps/sysvinit/files/bootlogd deleted file mode 100755 index 3f3e3634..00000000 --- a/sys-apps/sysvinit/files/bootlogd +++ /dev/null @@ -1,12 +0,0 @@ -#!/sbin/openrc-run -# Copyright 1999-2018 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -description="bootlogd - record boot messages (sysvinit)" -pidfile="/run/bootlogd" -command="/sbin/bootlogd" -command_args="-c -p ${pidfile}" - -depend() { - need localmount root -} diff --git a/sys-apps/sysvinit/files/bootlogd.initd b/sys-apps/sysvinit/files/bootlogd.initd deleted file mode 100644 index 11b3ab7b..00000000 --- a/sys-apps/sysvinit/files/bootlogd.initd +++ /dev/null @@ -1,8 +0,0 @@ -#!/sbin/openrc-run -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -description="bootlogd - record boot messages (sysvinit)" -pidfile="/run/bootlogd" -command="/sbin/bootlogd" -command_args="-p ${pidfile}" diff --git a/sys-apps/sysvinit/files/halt.sh b/sys-apps/sysvinit/files/halt.sh deleted file mode 100644 index ff68c425..00000000 --- a/sys-apps/sysvinit/files/halt.sh +++ /dev/null @@ -1,6 +0,0 @@ -#!/bin/sh -if [ "${INIT_HALT}" = HALT ]; then - exec /sbin/halt -dhn -else - exec /sbin/poweroff -dhn -fi diff --git a/sys-apps/sysvinit/files/inittab-2.91 b/sys-apps/sysvinit/files/inittab-2.91 deleted file mode 100644 index f9ed8d11..00000000 --- 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.95 b/sys-apps/sysvinit/files/inittab-2.95 deleted file mode 100644 index 03f226a8..00000000 --- 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.86-kexec.patch b/sys-apps/sysvinit/files/sysvinit-2.86-kexec.patch deleted file mode 100644 index 4948806d..00000000 --- a/sys-apps/sysvinit/files/sysvinit-2.86-kexec.patch +++ /dev/null @@ -1,142 +0,0 @@ -halt: add a -k kexec flag - ---- a/man/halt.8 -+++ b/man/halt.8 -@@ -40,6 +40,7 @@ halt, reboot, poweroff \- stop the system. - .RB [ \-d ] - .RB [ \-f ] - .RB [ \-i ] -+.RB [ \-k ] - .br - .B /sbin/poweroff - .RB [ \-n ] -@@ -83,6 +84,8 @@ Put all hard drives on the system in stand-by mode just before halt or power-off - .IP \fB\-p\fP - When halting the system, switch off the power. This is the default when halt is - called as \fBpoweroff\fP. -+.IP \fB\-k\fP -+Try to reboot using \fBkexec\fP, if kernel supports it. - .\"}}} - .\"{{{ Diagnostics - .SH DIAGNOSTICS ---- a/src/halt.c -+++ b/src/halt.c -@@ -8,7 +8,7 @@ - * execute an "shutdown -r". This is for compatibility with - * sysvinit 2.4. - * -- * Usage: halt [-n] [-w] [-d] [-f] [-h] [-i] [-p] -+ * Usage: halt [-n] [-w] [-d] [-f] [-h] [-i] [-p] [-k] - * -n: don't sync before halting the system - * -w: only write a wtmp reboot record and exit. - * -d: don't write a wtmp record. -@@ -16,6 +16,7 @@ - * -h: put harddisks in standby mode - * -i: shut down all network interfaces. - * -p: power down the system (if possible, otherwise halt). -+ * -k: reboot the system using kexec. - * - * Reboot and halt are both this program. Reboot - * is just a link to halt. Invoking the program -@@ -74,8 +75,10 @@ extern void write_wtmp(char *user, char *id, int pid, int type, char *line); - */ - void usage(void) - { -- fprintf(stderr, "usage: %s [-n] [-w] [-d] [-f] [-h] [-i]%s\n", -- progname, strcmp(progname, "halt") ? "" : " [-p]"); -+ fprintf(stderr, "usage: %s [-n] [-w] [-d] [-f] [-h] [-i]%s%s\n", -+ progname, -+ strcmp(progname, "halt") ? "" : " [-p]", -+ strcmp(progname, "reboot") ? "" : " [-k]"); - fprintf(stderr, "\t-n: don't sync before halting the system\n"); - fprintf(stderr, "\t-w: only write a wtmp reboot record and exit.\n"); - fprintf(stderr, "\t-d: don't write a wtmp record.\n"); -@@ -84,6 +87,8 @@ void usage(void) - fprintf(stderr, "\t-i: shut down all network interfaces.\n"); - if (!strcmp(progname, "halt")) - fprintf(stderr, "\t-p: power down the system (if possible, otherwise halt).\n"); -+ if (!strcmp(progname, "reboot")) -+ fprintf(stderr, "\t-k: reboot the system using kexec.\n"); - exit(1); - } - -@@ -182,6 +187,7 @@ int main(int argc, char **argv) - int do_ifdown = 0; - int do_hddown = 0; - int do_poweroff = 0; -+ int do_kexec = 0; - int c; - char *tm = NULL; - -@@ -201,7 +207,7 @@ int main(int argc, char **argv) - /* - * Get flags - */ -- while((c = getopt(argc, argv, ":ihdfnpwt:")) != EOF) { -+ while((c = getopt(argc, argv, ":ihdfnpwkt:")) != EOF) { - switch(c) { - case 'n': - do_sync = 0; -@@ -225,6 +231,9 @@ int main(int argc, char **argv) - case 'p': - do_poweroff = 1; - break; -+ case 'k': -+ do_kexec = 1; -+ break; - case 't': - tm = optarg; - break; -@@ -242,10 +251,24 @@ int main(int argc, char **argv) - (void)chdir("/"); - - if (!do_hard && !do_nothing) { -+ c = get_runlevel(); -+ -+ /* -+ * We can't reboot using kexec through this path. -+ */ -+ if (c != '6' && do_reboot && do_kexec) { -+ fprintf(stderr, "ERROR: using -k at this" -+ " runlevel requires also -f\n" -+ " (You probably want instead to reboot" -+ " normally and let your reboot\n" -+ " script, usually /etc/init.d/reboot," -+ " specify -k)\n"); -+ exit(1); -+ } -+ - /* - * See if we are in runlevel 0 or 6. - */ -- c = get_runlevel(); - if (c != '0' && c != '6') - do_shutdown(do_reboot ? "-r" : "-h", tm); - } -@@ -277,6 +300,15 @@ int main(int argc, char **argv) - if (do_nothing) exit(0); - - if (do_reboot) { -+ /* -+ * kexec or reboot -+ */ -+ if (do_kexec) -+ init_reboot(BMAGIC_KEXEC); -+ -+ /* -+ * Fall through if failed -+ */ - init_reboot(BMAGIC_REBOOT); - } else { - /* ---- a/src/reboot.h -+++ b/src/reboot.h -@@ -47,5 +47,8 @@ - # define BMAGIC_POWEROFF BMAGIC_HALT - #endif - -+/* for kexec support */ -+#define BMAGIC_KEXEC 0x45584543 -+ - #define init_reboot(magic) reboot(magic) - 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 b8e403f6..00000000 --- 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.92_beta-shutdown-h.patch deleted file mode 100644 index e53a9208..00000000 --- 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) { - diff --git a/sys-apps/sysvinit/files/sysvinit-2.94_beta-shutdown-single.patch b/sys-apps/sysvinit/files/sysvinit-2.94_beta-shutdown-single.patch deleted file mode 100644 index 9aa85229..00000000 --- a/sys-apps/sysvinit/files/sysvinit-2.94_beta-shutdown-single.patch +++ /dev/null @@ -1,39 +0,0 @@ -This patch makes shutdown use the Single User runlevel by default so -the gettys are shutdown too. - -Roy Marples <uberlord@gentoo.org> - -Forward-ported from v2.86 to v2.94_beta -Lars Wendler <polynomial-c@gentoo.org> - ---- sysvinit-2.94/man/shutdown.8 -+++ sysvinit-2.94/man/shutdown.8 -@@ -44,7 +44,7 @@ - \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 ---- sysvinit-2.94/src/shutdown.c -+++ sysvinit-2.94/src/shutdown.c -@@ -547,7 +547,7 @@ - usage(); - exit(1); - } -- strcpy(down_level, "1"); -+ strcpy(down_level, "S"); - halttype = NULL; - memset(when, '\0', WHEN_SIZE); - -@@ -734,6 +734,8 @@ - strncpy(newstate, "for reboot", STATELEN); - break; - case '1': -+ case 'S': -+ case 's': - strncpy(newstate, "to maintenance mode", STATELEN); - break; - default: 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 f24e1029..00000000 --- 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) { - diff --git a/sys-apps/sysvinit/metadata.xml b/sys-apps/sysvinit/metadata.xml deleted file mode 100644 index 53e04953..00000000 --- a/sys-apps/sysvinit/metadata.xml +++ /dev/null @@ -1,12 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> -<maintainer type="person"> - <email>williamh@gentoo.org</email> - <name>William Hubbs</name> -</maintainer> -<maintainer type="project"> - <email>base-system@gentoo.org</email> - <name>Gentoo Base System</name> -</maintainer> -</pkgmetadata> diff --git a/sys-apps/sysvinit/sysvinit-2.93.ebuild b/sys-apps/sysvinit/sysvinit-2.93.ebuild deleted file mode 100644 index f36bbbac..00000000 --- a/sys-apps/sysvinit/sysvinit-2.93.ebuild +++ /dev/null @@ -1,123 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit toolchain-funcs flag-o-matic - -DESCRIPTION="/sbin/init - parent of all processes" -HOMEPAGE="https://savannah.nongnu.org/projects/sysvinit" -SRC_URI="mirror://nongnu/${PN}/${P/_/-}.tar.xz" - -LICENSE="GPL-2" -SLOT="0" -[[ "${PV}" == *beta* ]] || \ -KEYWORDS="x86" -IUSE="selinux ibm static" - -CDEPEND=" - selinux? ( - >=sys-libs/libselinux-1.28 - )" -DEPEND="${CDEPEND} - virtual/os-headers" -RDEPEND="${CDEPEND} - selinux? ( sec-policy/selinux-shutdown ) - !<sys-apps/openrc-0.13 -" - -S="${WORKDIR}/${P/_*}" - -PATCHES=( - "${FILESDIR}/${PN}-2.86-kexec.patch" #80220 - "${FILESDIR}/${PN}-2.86-shutdown-single.patch" #158615 - "${FILESDIR}/${PN}-2.92_beta-shutdown-h.patch" #449354 -) - -src_prepare() { - default - sed -i '/^CPPFLAGS =$/d' src/Makefile || die - - # last/lastb/mesg/mountpoint/sulogin/utmpdump/wall have moved to util-linux - sed -i -r \ - -e '/^(USR)?S?BIN/s:\<(last|lastb|mesg|mountpoint|sulogin|utmpdump|wall)\>::g' \ - -e '/^MAN[18]/s:\<(last|lastb|mesg|mountpoint|sulogin|utmpdump|wall)[.][18]\>::g' \ - src/Makefile || die - - # pidof has moved to >=procps-3.3.9 - sed -i -r \ - -e '/\/bin\/pidof/d' \ - -e '/^MAN8/s:\<pidof.8\>::g' \ - src/Makefile || die - - # stack protector is broken on x86 musl - sed -i 's/-fstack-protector-strong//' src/Makefile || die - - # Mung inittab for specific architectures - cd "${WORKDIR}" || die - cp "${FILESDIR}"/inittab-2.91 inittab || die "cp inittab" - local insert=() - use ppc && insert=( '#psc0:12345:respawn:/sbin/agetty 115200 ttyPSC0 linux' ) - use arm && insert=( '#f0:12345:respawn:/sbin/agetty 9600 ttyFB0 vt100' ) - use arm64 && insert=( 'f0:12345:respawn:/sbin/agetty 9600 ttyAMA0 vt100' ) - use hppa && insert=( 'b0:12345:respawn:/sbin/agetty 9600 ttyB0 vt100' ) - use s390 && insert=( 's0:12345:respawn:/sbin/agetty 38400 console dumb' ) - if use ibm ; then - insert+=( - '#hvc0:2345:respawn:/sbin/agetty -L 9600 hvc0' - '#hvsi:2345:respawn:/sbin/agetty -L 19200 hvsi0' - ) - fi - (use arm || use mips || use sparc) && sed -i '/ttyS0/s:#::' inittab - if use x86 || use amd64 ; then - sed -i \ - -e '/ttyS[01]/s:9600:115200:' \ - inittab - fi - if [[ ${#insert[@]} -gt 0 ]] ; then - printf '%s\n' '' '# Architecture specific features' "${insert[@]}" >> inittab - fi -} - -src_compile() { - tc-export CC - append-lfs-flags - export DISTRO= #381311 - export VERSION="${PV}" - use static && append-ldflags -static - emake -C src $(usex selinux 'WITH_SELINUX=yes' '') -} - -src_install() { - emake -C src install ROOT="${D}" - dodoc README doc/* - - insinto /etc - doins "${WORKDIR}"/inittab - - # dead symlink - rm "${ED%/}"/usr/bin/lastb || die - - newinitd "${FILESDIR}"/bootlogd.initd bootlogd -} - -pkg_postinst() { - # Reload init to fix unmounting problems of / on next reboot. - # This is really needed, as without the new version of init cause init - # not to quit properly on reboot, and causes a fsck of / on next reboot. - if [[ ${ROOT} == / ]] ; then - if [[ -e /dev/initctl && ! -e /run/initctl ]]; then - ln -s /dev/initctl /run/initctl - fi - # Do not return an error if this fails - /sbin/telinit U &>/dev/null - fi - - elog "The last/lastb/mesg/mountpoint/sulogin/utmpdump/wall tools have been moved to" - elog "sys-apps/util-linux. The pidof tool has been moved to sys-process/procps." - - # Required for new bootlogd service - if [[ ! -e "${EROOT%/}/var/log/boot" ]] ; then - touch "${EROOT%/}/var/log/boot" - fi -} diff --git a/sys-apps/sysvinit/sysvinit-2.97.ebuild b/sys-apps/sysvinit/sysvinit-2.97.ebuild deleted file mode 100644 index d64e7290..00000000 --- a/sys-apps/sysvinit/sysvinit-2.97.ebuild +++ /dev/null @@ -1,147 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit toolchain-funcs flag-o-matic - -DESCRIPTION="/sbin/init - parent of all processes" -HOMEPAGE="https://savannah.nongnu.org/projects/sysvinit" -SRC_URI="mirror://nongnu/${PN}/${P/_/-}.tar.xz" - -LICENSE="GPL-2" -SLOT="0" -[[ "${PV}" == *beta* ]] || \ -KEYWORDS="x86" -IUSE="selinux ibm static kernel_FreeBSD" - -CDEPEND=" - selinux? ( - >=sys-libs/libselinux-1.28 - )" -DEPEND="${CDEPEND} - virtual/os-headers" -RDEPEND="${CDEPEND} - selinux? ( sec-policy/selinux-shutdown ) - !<sys-apps/openrc-0.13 -" - -S="${WORKDIR}/${P/_*}" - -PATCHES=( - "${FILESDIR}/${PN}-2.86-kexec.patch" #80220 - "${FILESDIR}/${PN}-2.94_beta-shutdown-single.patch" #158615 - "${FILESDIR}/${PN}-2.95_beta-shutdown-h.patch" #449354 -) - -src_prepare() { - default - - sed -i \ - -e '/^CPPFLAGS =$/d' \ - -e '/^override CFLAGS +=/s/ -fstack-protector-strong//' \ - src/Makefile || die - - # last/lastb/mesg/mountpoint/sulogin/utmpdump/wall have moved to util-linux - sed -i -r \ - -e '/^(USR)?S?BIN/s:\<(last|lastb|mesg|mountpoint|sulogin|utmpdump|wall)\>::g' \ - -e '/^MAN[18]/s:\<(last|lastb|mesg|mountpoint|sulogin|utmpdump|wall)[.][18]\>::g' \ - src/Makefile || die - - # pidof has moved to >=procps-3.3.9 - sed -i -r \ - -e '/\/bin\/pidof/d' \ - -e '/^MAN8/s:\<pidof.8\>::g' \ - src/Makefile || die - - # stack protector is broken on x86 musl - sed -i 's/-fstack-protector-strong//' src/Makefile || die - - # logsave is already in e2fsprogs - sed -i -r \ - -e '/^(USR)?S?BIN/s:\<logsave\>::g' \ - -e '/^MAN8/s:\<logsave.8\>::g' \ - src/Makefile || die - - # Mung inittab for specific architectures - cd "${WORKDIR}" || die - cp "${FILESDIR}"/inittab-2.95 inittab || die "cp inittab" - local insert=() - use ppc && insert=( '#psc0:12345:respawn:/sbin/agetty 115200 ttyPSC0 linux' ) - use arm && insert=( '#f0:12345:respawn:/sbin/agetty 9600 ttyFB0 vt100' ) - use arm64 && insert=( 'f0:12345:respawn:/sbin/agetty 9600 ttyAMA0 vt100' ) - use hppa && insert=( 'b0:12345:respawn:/sbin/agetty 9600 ttyB0 vt100' ) - use s390 && insert=( 's0:12345:respawn:/sbin/agetty 38400 console dumb' ) - if use ibm ; then - insert+=( - '#hvc0:2345:respawn:/sbin/agetty -L 9600 hvc0' - '#hvsi:2345:respawn:/sbin/agetty -L 19200 hvsi0' - ) - fi - (use arm || use mips || use sparc) && sed -i '/ttyS0/s:#::' inittab - if use kernel_FreeBSD ; then - sed -i \ - -e 's/linux/cons25/g' \ - -e 's/ttyS0/cuaa0/g' \ - -e 's/ttyS1/cuaa1/g' \ - inittab #121786 - fi - if use x86 || use amd64 ; then - sed -i \ - -e '/ttyS[01]/s:9600:115200:' \ - inittab - fi - if [[ ${#insert[@]} -gt 0 ]] ; then - printf '%s\n' '' '# Architecture specific features' "${insert[@]}" >> inittab - fi -} - -src_compile() { - tc-export CC - append-lfs-flags - export DISTRO= #381311 - export VERSION="${PV}" - use static && append-ldflags -static - emake -C src $(usex selinux 'WITH_SELINUX=yes' '') -} - -src_install() { - emake -C src install ROOT="${D}" - dodoc README doc/* - - insinto /etc - doins "${WORKDIR}"/inittab - - # dead symlink - rm "${ED}"/usr/bin/lastb || die - - newinitd "${FILESDIR}"/bootlogd.initd bootlogd - into / - dosbin "${FILESDIR}"/halt.sh - - keepdir /etc/inittab.d - - find "${ED}" -type d -empty -delete || die -} - -pkg_postinst() { - # Reload init to fix unmounting problems of / on next reboot. - # This is really needed, as without the new version of init cause init - # not to quit properly on reboot, and causes a fsck of / on next reboot. - if [[ -z ${ROOT} ]] ; then - if [[ -e /dev/initctl ]] && [[ ! -e /run/initctl ]] ; then - ln -s /dev/initctl /run/initctl \ - || ewarn "Failed to set /run/initctl symlink!" - fi - # Do not return an error if this fails - /sbin/telinit U &>/dev/null - fi - - elog "The last/lastb/mesg/mountpoint/sulogin/utmpdump/wall tools have been moved to" - elog "sys-apps/util-linux. The pidof tool has been moved to sys-process/procps." - - # Required for new bootlogd service - if [[ ! -e "${EROOT}/var/log/boot" ]] ; then - touch "${EROOT}/var/log/boot" - fi -} |