init-functions now checks for read access before attempting to read environ

* 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

@@ -8,16 +8,17 @@
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
 
-DEPENDS = bash,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.0-0
+VERSION := 1.6-0
 
 include /usr/share/snap/Makefile.snaplinux
 

SNAP/usher

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/sh
 
 set -e
 
@@ -7,25 +7,22 @@ case $1 in
     exit 0
     ;;
   postinst)
-    if [[ ${TARGET} ]]; then
-      chroot ${TARGET} 'update-rc required'
-    else
     update-rc required
+
+    if [ ! -f /etc/fstab ]; then
+      cp /usr/share/initscripts/fstab /etc/fstab
     fi
 
-    if [ ! -f ${TARGET}/etc/modules.conf ]; then
-      cp ${TARGET}/usr/share/initscripts/modules.conf \
-        ${TARGET}/etc/modules.conf
+    if [ ! -f /etc/modules.conf ]; then
+      cp /usr/share/initscripts/modules.conf /etc/modules.conf
     fi
 
-    if [ ! -f ${TARGET}/etc/default/halt ]; then
-      cp ${TARGET}/usr/share/initscripts/halt.default \
-        ${TARGET}/etc/default/halt
+    if [ ! -f /etc/default/halt ]; then
+      cp /usr/share/initscripts/halt.default /etc/default/halt
     fi
 
-    if [ ! -f ${TARGET}/etc/default/rcS ]; then
-      cp ${TARGET}/usr/share/initscripts/rcS.default \
-        ${TARGET}/etc/default/rcS
+    if [ ! -f /etc/default/rcS ]; then
+      cp /usr/share/initscripts/rcS.default /etc/default/rcS
     fi
     ;;
   prerm)

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
@@ -22,12 +21,14 @@ files:
 	install -m 755 init.d/swap $(DESTDIR)/etc/init.d/swap
 	install -m 755 init.d/sysctl $(DESTDIR)/etc/init.d/sysctl
 	install -m 755 init-functions $(DESTDIR)/lib/lsb/init-functions
+	install -m 644 fstab \
+		$(DESTDIR)/usr/share/initscripts/fstab
 	install -m 644 halt.default \
 		$(DESTDIR)/usr/share/initscripts/halt.default
 	install -m 644 modules.conf \
 		$(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

SRC/initscripts/fstab

@@ -0,0 +1,4 @@
+#
+# /etc/fstab - file system mount definitions
+#
+# <file system> <mount point>   <type>  <options>       <dump>  <fsck>

SRC/initscripts/init-functions

@@ -1,4 +1,18 @@
-#!/bin/sh
+# /lib/lsb/init-functions - shell functions and variables for init scripts
+
+#
+# This sets some environment variables that init scripts can use
+# to determine if we're running in a container
+#
+# Most likely just checking for the presence of $container would
+# be enough
+#
+
+if [ -r /proc/1/environ ]; then
+  chkcontainer=$(sed 's/\x0/\n/g' < /proc/1/environ|grep -ia '^container\|^LXC')
+fi
+
+[ -n "$chkcontainer" ] && export $chkcontainer
 
 COL52="\\033[52G"
 
@@ -54,19 +68,19 @@ log_init_msg() {
 }
 
 log_failure_msg() {
-  echo -e "$COL52[ FAIL ]"
+  echo "$COL52[ FAIL ]"
 
   return
 }
 
 log_success_msg() {
-  echo -e "$COL52[  OK  ]"
+  echo "$COL52[  OK  ]"
 
   return
 }
 
 log_warning_msg() {
-  echo -e "$COL52[ WARN ]"
+  echo "$COL52[ WARN ]"
 
   return
 }

SRC/initscripts/init.d/checkfs

@@ -1,7 +1,7 @@
 #!/bin/sh
 ### BEGIN INIT INFO
 # Provides:            checkfs
-# Required-Start:      udev swap $time hostname hwclock
+# Required-Start:      udev swap $time hostname
 # Required-Stop:
 # Should-Start:
 # Should-Stop:
@@ -12,6 +12,7 @@
 ### END INIT INFO
 
 . /lib/lsb/init-functions
+[ -z $container ] || exit 0
 
 case "$1" in
   start)

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

SRC/initscripts/init.d/hostname

@@ -1,8 +1,8 @@
 #!/bin/sh
 ### BEGIN INIT INFO
 # Provides:            hostname
-# Required-Start:      $local_fs
-# Required-Stop:       $local_fs
+# Required-Start:
+# Required-Stop:
 # Should-Start:
 # Should-Stop
 # Default-Start:       S

SRC/initscripts/init.d/hwclock

@@ -15,6 +15,8 @@
 ### END INIT INFO
 
 . /lib/lsb/init-functions
+[ -r /etc/default/rcS ] && . /etc/default/rcS
+[ -z $container ] || exit 0
 
 case "$UTC" in
   0|n|no)

SRC/initscripts/init.d/localnet

@@ -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

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

SRC/initscripts/init.d/mountfs

@@ -1,17 +1,4 @@
 #!/bin/sh
-########################################################################
-# Begin mountfs
-#
-# Description : File System Mount Script
-#
-# Authors     : Gerard Beekmans - gerard@linuxfromscratch.org
-#               DJ Lucas - dj@linuxfromscratch.org
-# Update      : Bruce Dubbs - bdubbs@linuxfromscratch.org
-#
-# Version     : LFS 7.0
-#
-########################################################################
-
 ### BEGIN INIT INFO
 # Provides:            $local_fs
 # Required-Start:      udev checkfs
@@ -20,62 +7,56 @@
 # Should-Stop:
 # Default-Start:       S
 # Default-Stop:        0 6
-# Short-Description:   Mounts/unmounts local filesystems defined in /etc/fstab.
+# Short-Description:   Mounts/unmounts local filesystems
 # Description:         Remounts root filesystem read/write and mounts all
-#                      remaining local filesystems defined in /etc/fstab on
-#                      start. Remounts root filesystem read-only and unmounts
+#                      remaining local filesystems defined in /etc/fstab or
+#                      in ZFS. Remounts root filesystem read-only and unmounts
 #                      remaining filesystems on stop.
-# X-LFS-Provided-By:   LFS
 # X-Required:          true
 ### END INIT INFO
 
 . /lib/lsb/init-functions
 
-#!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-#
-# needs work!!
-# probably need to split up
-# separate scripts for / and
-# network filesystems
-#
-# Ok, so network filesystems
-# init scripts should be included
-# as part of the package. This
-# script should only be for
-# standard local filesystems
-#
-#!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+[ -z $container ] || exit 0
 
 case "$1" in
   start)
     log_init_msg "Remounting root file system in read-write mode"
     mount -o remount,rw / >/dev/null && log_success_msg || log_failure_msg
 
-   # Remove fsck-related file system watermarks.
-   rm -f /fastboot /forcefsck
+    if [ -f /fastboot ]; then
+      log_init_msg "Clearing /fastboot"
+      rm /fastboot && log_success_msg || log_failure_msg
+    fi
 
-   # Make sure /dev/pts exists
-#   mkdir -p /dev/pts
+    if [ -f /forcefsck ]; then
+      log_init_msg "Clearing /forcefsk"
+      rm /forcefsck && log_success_msg || log_failure_msg
+    fi
 
-   # This will mount all filesystems that do not have _netdev in
-   # their option list.  _netdev denotes a network filesystem.
+    if [ -x /sbin/zpool ]; then
+      if zpool list rpool 2>&1 > /dev/null; then
+        log_init_msg "Mounting ZFS file systems"
+        zfs mount -a && log_success_msg || log_failure_msg
+      fi
+    fi
 
     log_init_msg "Mounting remaining file systems"
     mount -a -O no_netdev >/dev/null && log_success_msg || log_failure_msg
-   exit $failed
     ;;
   stop)
-   # Don't unmount virtual file systems like /run
     log_init_msg "Unmounting all file systems"
-   umount -a -d -r -t notmpfs,nosysfs,nodevtmpfs,noproc,nodevpts >/dev/null && \
-     log_success_msg || log_failure_msg
+    umount -a -d -r -t notmpfs,nosysfs,nodevtmpfs,noproc,nodevpts \
+      >/dev/null && log_success_msg || log_failure_msg
+
+    if [ -x /sbin/zpool ]; then
+      if zpool list rpool 2>&1 > /dev/null; then
+        log_init_msg "Unmounting ZFS file systems"
+        zfs umount -a && log_success_msg || log_failure_msg
+      fi
+    fi
 
-   # Make sure / is mounted read only (umount bug)
     mount -o remount,ro /
-
-   # Make all LVM volume groups unavailable, if appropriate
-   # This fails if swap or / are on an LVM partition
-   #if [ -x /sbin/vgchange ]; then /sbin/vgchange -an > /dev/null; fi
     ;;
   *)
     echo "Usage: $0 [start|stop]"

SRC/initscripts/init.d/mountvirtfs

@@ -80,14 +80,6 @@ mountrun () {
       /run || return 1
   fi
 
-  mkdir -p /run/lock /run/shm || return 1
-  chmod 1777 /run/shm || return 1
-
-  if grep -q '^utmp:' /etc/group; then
-    chmod 664 /run/utmp
-    chgrp utmp /run/utmp
-  fi
-
   return 0
 }
 
@@ -105,12 +97,21 @@ case "$1" in
   start|restart)
     log_init_msg "Mounting virtual file systems"
 
+    if [ -z $container ]; then
       for dir in dev pts proc run sys; do
         mount$dir || error=1
       done
+    fi
 
+    mkdir -p /run/lock /run/shm || error=1
+    chmod 1777 /run/shm || error=1
     ln -sfn /run/shm /dev/shm
       
+    if grep -q '^utmp:' /etc/group; then
+      chmod 664 /run/utmp >> /run/utmp
+      chgrp utmp /run/utmp
+    fi
+
     [ -z $error ] && log_success_msg || log_failure_msg
     ;;
   status)

SRC/initscripts/init.d/rc

@@ -22,11 +22,11 @@ print_snap() {
 
 case "$1" in
   S|1|2|3|4|5|6|0)
-    if [ "$RUNLEVEL" == "S" ]; then
+    if [ "$RUNLEVEL" = "S" ]; then
       set -a
       [ -r /etc/default/rcS ] && . /etc/default/rcS
       set +a
-      dmesg -n "${LOGLEVEL:-7}"
+      [ -z $container ] && dmesg -n "${LOGLEVEL:-7}"
       print_snap
     fi
 

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)

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
 

SRC/initscripts/update-rc

@@ -180,14 +180,15 @@ sub readsvcs {
 		error( int( $! ), "opendir(): " . INITDIR . ": $!" );
 
 	foreach my $svcname ( sort( readdir( DIR ) ) ) {
-		if ( ! -X INITDIR . "/$svcname" ) {
+		if ( ! -f INITDIR . "/$svcname" ||
+		! -X INITDIR . "/$svcname" ) {
 			next;
 			}
 
 		$services->{$svcname} = readinfo( INITDIR . "/$svcname" );
 
 		if ( ! @{$services->{$svcname}{'Provides'}} ) {
-			undef( $services->{$svcname} );
+			delete( $services->{$svcname} );
 
 			next;
 			}
@@ -207,7 +208,8 @@ sub sdepends {
 	my $sdepends = shift || [];
 	my $stack = shift || [];
 
-	if ( @$stack > 99 ) {
+	if ( $stack->[0] && grep( $_ eq $service->{'name'}, @$stack )
+	|| @$stack > 99 ) {
 		return;
 		}