Mercurial > vanilla
changeset 1214:fccafe36014b
core/sysvinit: remove
author | David Demelier <markand@malikania.fr> |
---|---|
date | Tue, 27 Jul 2021 16:45:51 +0200 |
parents | 4db6f80bd483 |
children | 3214f7fed454 |
files | core/sysvinit/disable-components.patch core/sysvinit/inittab core/sysvinit/message-style.patch core/sysvinit/sysvinit-post.sh core/sysvinit/sysvinit.sh core/sysvinit/sysvinit.sha1 |
diffstat | 6 files changed, 0 insertions(+), 198 deletions(-) [+] |
line wrap: on
line diff
--- a/core/sysvinit/disable-components.patch Tue Nov 19 20:05:00 2019 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,62 +0,0 @@ ---- src/Makefile.orig 2019-02-28 10:43:10.112032134 +0100 -+++ src/Makefile 2019-02-28 10:49:57.227210545 +0100 -@@ -23,42 +23,13 @@ - - # For some known distributions we do not build all programs, otherwise we do. - BIN = --SBIN = init halt shutdown runlevel killall5 fstab-decode logsave --USRBIN = last mesg readbootlog -+SBIN = init halt shutdown runlevel killall5 -+USRBIN = - --MAN1 = last.1 lastb.1 mesg.1 readbootlog.1 --MAN5 = initscript.5 inittab.5 initctl.5 --MAN8 = halt.8 init.8 killall5.8 pidof.8 poweroff.8 reboot.8 runlevel.8 --MAN8 += shutdown.8 telinit.8 fstab-decode.8 logsave.8 -- --ifeq ($(DISTRO),) --SBIN += sulogin bootlogd --USRBIN += utmpdump wall --MAN1 += utmpdump.1 wall.1 --MAN8 += sulogin.8 bootlogd.8 --endif -- --ifeq ($(DISTRO),Debian) --CPPFLAGS+= -DACCTON_OFF --SBIN += sulogin bootlogd --MAN8 += sulogin.8 bootlogd.8 --MANDB := --endif -- --ifeq ($(DISTRO),Owl) --USRBIN += wall --MAN1 += wall.1 --MANDB := --endif -- --ifeq ($(DISTRO),SuSE) --CPPFLAGS+= -DUSE_SYSFS -DSANE_TIO -DSIGINT_ONLYONCE -DUSE_ONELINE --SBIN += sulogin --USRBIN += utmpdump --MAN1 += utmpdump.1 --MAN8 += sulogin.8 --MANDB := --endif -+MAN1 = -+MAN5 = initscript.5 inittab.5 -+MAN8 = halt.8 init.8 killall5.8 poweroff.8 reboot.8 runlevel.8 -+MAN8 += shutdown.8 telinit.8 - - ifeq ($(MNTPOINT),yes) - BIN += mountpoint -@@ -206,10 +177,6 @@ - ln -sf halt $(ROOT)/sbin/reboot - ln -sf halt $(ROOT)/sbin/poweroff - ln -sf init $(ROOT)/sbin/telinit -- ln -sf /sbin/killall5 $(ROOT)/bin/pidof -- if [ ! -f $(ROOT)/usr/bin/lastb ]; then \ -- ln -sf last $(ROOT)/usr/bin/lastb; \ -- fi - $(INSTALL_DIR) $(ROOT)/usr/include/ - $(INSTALL_DATA) initreq.h $(ROOT)/usr/include/ - $(INSTALL_DIR) $(ROOT)$(MANDIR)/man1/
--- a/core/sysvinit/inittab Tue Nov 19 20:05:00 2019 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,45 +0,0 @@ -# -# /etc/inittab -- init system configuration -# - -# -# Vanilla Linux recommends the following runlevels: -# -# S: single user mode (no services at all) -# 1: single user mode -# 2: multi user mode (console) -# 3: multi user mode (graphical) -# 4, 5: unused but kept to administrator discretion. -# -# The following run levels are special and must not be used as default: -# -# 0: power off -# 6: reboot -# - -# Default run level. -id:2:initdefault: - -# System initialization. -si::sysinit:/etc/rc.init - -# Runlevels. -lS:S:wait:/bin/sulogin -l0:0:wait:/etc/rc.shutdown 0 -l1:1:wait:/etc/rc.start 1 -l2:2:wait:/etc/rc.start 2 -l3:3:wait:/etc/rc.start 3 -l4:4:wait:/etc/rc.start 4 -l5:5:wait:/etc/rc.start 5 -l6:6:wait:/etc/rc.shutdown 6 - -# Shutdown on ctrl+alt+delete. -ca::ctrlaltdel:/bin/shutdown -t1 -h now - -# Console terminals. -c1:2345:respawn:/bin/agetty --noclear 38400 tty1 linux -c2:2345:respawn:/bin/agetty 38400 tty2 linux -c3:2345:respawn:/bin/agetty 38400 tty3 linux -c4:2345:respawn:/bin/agetty 38400 tty4 linux -c5:2345:respawn:/bin/agetty 38400 tty5 linux -c6:2345:respawn:/bin/agetty 38400 tty6 linux
--- a/core/sysvinit/message-style.patch Tue Nov 19 20:05:00 2019 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,23 +0,0 @@ ---- src/init.c.orig 2019-04-04 12:29:07.034568092 +0200 -+++ src/init.c 2019-04-04 12:30:13.601981106 +0200 -@@ -930,7 +930,7 @@ - * And log to the console. - */ - if (loglevel & L_CO) { -- print("\rINIT: "); -+ print("\r"); - print(buf); - print("\r\n"); - } -@@ -2816,11 +2816,6 @@ - close(fd); - - /* -- * Say hello to the world -- */ -- initlog(L_CO, bootmsg, "booting"); -- -- /* - * See if we have to start an emergency shell. - */ - if (emerg_shell) {
--- a/core/sysvinit/sysvinit-post.sh Tue Nov 19 20:05:00 2019 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,20 +0,0 @@ -#!/bin/sh -# -# Copyright (c) 2019 David Demelier <markand@malikania.fr> -# -# Permission to use, copy, modify, and/or distribute this software for any -# purpose with or without fee is hereby granted, provided that the above -# copyright notice and this permission notice appear in all copies. -# -# THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES -# WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF -# MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR -# ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES -# WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN -# ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF -# OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. -# - -if [ "$1" = "post-uninstall" ]; then - /bin/busybox --install -s -fi
--- a/core/sysvinit/sysvinit.sh Tue Nov 19 20:05:00 2019 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,47 +0,0 @@ -#!/bin/sh -# -# Copyright (c) 2019 David Demelier <markand@malikania.fr> -# -# Permission to use, copy, modify, and/or distribute this software for any -# purpose with or without fee is hereby granted, provided that the above -# copyright notice and this permission notice appear in all copies. -# -# THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES -# WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF -# MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR -# ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES -# WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN -# ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF -# OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. -# - -PKGNAME=sysvinit -PKGVERSION=2.94 -PKGREVISION=1 -PKGLICENSE="GPLv20+" -PKGSUMMARY="traditional System V init" -PKGDOWNLOAD="http://download.savannah.nongnu.org/releases/$PKGNAME/$PKGNAME-$PKGVERSION.tar.xz" -PKGPROTECT="etc/inittab" - -: ${CC:=clang} -: ${CFLAGS:=-O2} - -build() -{ - rm -rf $PKGNAME-$PKGVERSION - tar xvf $PKGNAME-$PKGVERSION.tar.xz - cd $PKGNAME-$PKGVERSION - - patch -p0 < ../disable-components.patch - patch -p0 < ../message-style.patch - sed -i -e 's|$(ROOT)/sbin|$(ROOT)/bin|g' src/Makefile - sed -i -e 's|$(ROOT)/usr/bin|$(ROOT)/bin|g' src/Makefile - sed -i -e 's|$(ROOT)/usr/sbin|$(ROOT)/bin|g' src/Makefile - sed -i -e 's|$(ROOT)/usr/include|$(ROOT)/include|g' src/Makefile - make CC="$CC" CFLAGS="$CFLAGS" - make install ROOT=$DESTDIR MANDIR=/share/man - install -Dm0644 ../inittab $DESTDIR/etc/inittab - - cd .. - rm -rf $PKGNAME-$PKGVERSION -}