From 8d4cb9e335a54f2d493051123ffe6b53e467048c Mon Sep 17 00:00:00 2001 From: Jay Larson Date: Sun, 3 Dec 2017 14:27:54 -0600 Subject: [PATCH] The following changes were made * Moved update-rc to /usr/sbin * init-functions now exports container variable * init.d scripts should now act appropriately in containers * Removed localnet init script - should be performed by iftools init * Added REPO to Makefile --- Makefile | 7 ++++--- SRC/initscripts/Makefile | 5 ++--- SRC/initscripts/init-functions | 3 ++- SRC/initscripts/init.d/checkfs | 1 - SRC/initscripts/init.d/cleanfs | 1 + SRC/initscripts/init.d/hwclock | 2 +- SRC/initscripts/init.d/localnet | 37 --------------------------------- SRC/initscripts/init.d/modules | 1 + SRC/initscripts/init.d/swap | 2 ++ SRC/initscripts/init.d/sysctl | 1 + 10 files changed, 14 insertions(+), 46 deletions(-) delete mode 100755 SRC/initscripts/init.d/localnet diff --git a/Makefile b/Makefile index f484d49..337665f 100644 --- a/Makefile +++ b/Makefile @@ -8,16 +8,17 @@ # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # GNU General Public License for more details. -DEPENDS = dash,iftools,kmod,procps-ng,sysvinit +DEPENDS = dash,kmod,procps-ng,sysvinit ARCH = x86_64 URL = +REPO = core BRIEF = Base scripts for sysvinit -DESC = This package supplies the base system init scripts for sysvinit +DESC = This package supplies the core required init scripts for startup ARCHIVE := '' SRCDIR := $(PWD)/SRC/initscripts PATCHDIR := $(PWD)/SRC/patches -VERSION := 1.4-0 +VERSION := 1.5-0 include /usr/share/snap/Makefile.snaplinux diff --git a/SRC/initscripts/Makefile b/SRC/initscripts/Makefile index 8b145e6..8cd6562 100644 --- a/SRC/initscripts/Makefile +++ b/SRC/initscripts/Makefile @@ -4,7 +4,7 @@ dirs: install -d -m 755 $(DESTDIR)/lib/lsb install -d -m 755 $(DESTDIR)/usr/share/initscripts install -d -m 755 $(DESTDIR)/usr/share/man/man8 - install -d -m 755 $(DESTDIR)/sbin + install -d -m 755 $(DESTDIR)/usr/sbin files: install -m 755 init.d/checkfs $(DESTDIR)/etc/init.d/checkfs @@ -12,7 +12,6 @@ files: install -m 755 init.d/halt $(DESTDIR)/etc/init.d/halt install -m 755 init.d/hostname $(DESTDIR)/etc/init.d/hostname install -m 755 init.d/hwclock $(DESTDIR)/etc/init.d/hwclock - install -m 755 init.d/localnet $(DESTDIR)/etc/init.d/localnet install -m 755 init.d/modules $(DESTDIR)/etc/init.d/modules install -m 755 init.d/mountfs $(DESTDIR)/etc/init.d/mountfs install -m 755 init.d/mountvirtfs $(DESTDIR)/etc/init.d/mountvirtfs @@ -30,6 +29,6 @@ files: $(DESTDIR)/usr/share/initscripts/modules.conf install -m 644 rcS.default \ $(DESTDIR)/usr/share/initscripts/rcS.default - install -m 755 update-rc $(DESTDIR)/sbin + install -m 755 update-rc $(DESTDIR)/usr/sbin install: dirs files diff --git a/SRC/initscripts/init-functions b/SRC/initscripts/init-functions index e6bfbbd..3964c6b 100644 --- a/SRC/initscripts/init-functions +++ b/SRC/initscripts/init-functions @@ -8,7 +8,8 @@ # be enough # -export $(sed 's/\x0/\n/g' < /proc/1/environ|grep -ia '^container\|^LXC') +chkcontainer=$(sed 's/\x0/\n/g' < /proc/1/environ|grep -ia '^container\|^LXC') +[ -n "$chkcontainer" ] && export $chkcontainer COL52="\\033[52G" diff --git a/SRC/initscripts/init.d/checkfs b/SRC/initscripts/init.d/checkfs index 5643454..0739f93 100755 --- a/SRC/initscripts/init.d/checkfs +++ b/SRC/initscripts/init.d/checkfs @@ -12,7 +12,6 @@ ### END INIT INFO . /lib/lsb/init-functions - [ -z $container ] || exit 0 case "$1" in diff --git a/SRC/initscripts/init.d/cleanfs b/SRC/initscripts/init.d/cleanfs index 72adddb..a00fde7 100755 --- a/SRC/initscripts/init.d/cleanfs +++ b/SRC/initscripts/init.d/cleanfs @@ -13,6 +13,7 @@ . /lib/lsb/init-functions [ -z "$CLEANDIRS" ] && exit 0 +[ -z $container ] || exit 0 clean() { [ -d $1 ] || return 1 diff --git a/SRC/initscripts/init.d/hwclock b/SRC/initscripts/init.d/hwclock index 2091450..624f2b2 100755 --- a/SRC/initscripts/init.d/hwclock +++ b/SRC/initscripts/init.d/hwclock @@ -15,7 +15,7 @@ ### END INIT INFO . /lib/lsb/init-functions - +[ -r /etc/default/rcS ] && . /etc/default/rcS [ -z $container ] || exit 0 case "$UTC" in diff --git a/SRC/initscripts/init.d/localnet b/SRC/initscripts/init.d/localnet deleted file mode 100755 index 9bc72d3..0000000 --- a/SRC/initscripts/init.d/localnet +++ /dev/null @@ -1,37 +0,0 @@ -#!/bin/sh -### BEGIN INIT INFO -# Provides: localnet -# Required-Start: $local_fs -# Required-Stop: $local_fs -# Should-Start: $syslog -# Should-Stop: $syslog -# Default-Start: S -# Default-Stop: 0 6 -# Short-Description: Start and configure loopback interface -# X-Required: true -### END INIT INFO - -. /lib/lsb/init-functions - -case "$1" in - start) - log_init_msg "Bringing up loopback interface" - ifup lo && log_success_msg || log_failure_msg - ;; - stop) - log_init_msg "Bringing down loopback interface" - ifdown lo && log_success_msg || log_failure_msg - ;; - - reload|restart) - log_init_msg "Restarting loopback interface" - ifreload lo && log_success_msg || log_failure_msg - ;; - - *) - echo "Usage: $0 [start|stop|reload|restart]" - exit 1 - ;; -esac - -exit 0 diff --git a/SRC/initscripts/init.d/modules b/SRC/initscripts/init.d/modules index 13bd418..d62e58a 100755 --- a/SRC/initscripts/init.d/modules +++ b/SRC/initscripts/init.d/modules @@ -15,6 +15,7 @@ CONF=/etc/modules.conf [ -r $CONF ] || exit 0 [ -e /proc/modules ] || exit 0 +[ -z $container ] || exit 0 egrep -qv '^(\s*#|$)' $CONF || exit 0 . /lib/lsb/init-functions diff --git a/SRC/initscripts/init.d/swap b/SRC/initscripts/init.d/swap index 7409bc9..698c26c 100755 --- a/SRC/initscripts/init.d/swap +++ b/SRC/initscripts/init.d/swap @@ -12,6 +12,8 @@ ### END INIT INFO . /lib/lsb/init-functions +[ -r /etc/fstab ] || exit 0 +[ -z $container ] || exit 0 case "$1" in start) diff --git a/SRC/initscripts/init.d/sysctl b/SRC/initscripts/init.d/sysctl index 0fc29e3..a8aab26 100755 --- a/SRC/initscripts/init.d/sysctl +++ b/SRC/initscripts/init.d/sysctl @@ -13,6 +13,7 @@ CONF=/etc/sysctl.conf [ -r $CONF ] || exit 0 +[ -z $container ] || exit 0 . /lib/lsb/init-functions