diff --git a/Makefile b/Makefile index 4abf8ff..fbe05b0 100644 --- a/Makefile +++ b/Makefile @@ -17,7 +17,7 @@ DESC = This package supplies the base system init scripts for sysvinit ARCHIVE := '' SRCDIR := $(PWD)/SRC/initscripts PATCHDIR := $(PWD)/SRC/patches -VERSION := 1.0-0 +VERSION := 1.1-0 include /usr/share/snap/Makefile.snaplinux diff --git a/SNAP/usher b/SNAP/usher index 466be9b..7029bcc 100755 --- a/SNAP/usher +++ b/SNAP/usher @@ -7,8 +7,12 @@ case $1 in exit 0 ;; postinst) + echo "[ENVIRONMENT]\n" + env + echo "TARGET: ${TARGET}" + if [[ ${TARGET} ]]; then - chroot ${TARGET} 'update-rc required' + chroot ${TARGET} update-rc required else update-rc required fi diff --git a/SRC/initscripts/init.d/checkfs b/SRC/initscripts/init.d/checkfs index 9fa2781..e715d78 100755 --- a/SRC/initscripts/init.d/checkfs +++ b/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: diff --git a/SRC/initscripts/init.d/hostname b/SRC/initscripts/init.d/hostname index e1e801a..2cf9211 100755 --- a/SRC/initscripts/init.d/hostname +++ b/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 diff --git a/SRC/initscripts/init.d/mountvirtfs b/SRC/initscripts/init.d/mountvirtfs index 6524739..44c258b 100755 --- a/SRC/initscripts/init.d/mountvirtfs +++ b/SRC/initscripts/init.d/mountvirtfs @@ -84,7 +84,7 @@ mountrun () { chmod 1777 /run/shm || return 1 if grep -q '^utmp:' /etc/group; then - chmod 664 /run/utmp + chmod 664 /run/utmp >> /run/utmp chgrp utmp /run/utmp fi diff --git a/SRC/initscripts/update-rc b/SRC/initscripts/update-rc index 96b6413..142fdd1 100755 --- a/SRC/initscripts/update-rc +++ b/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; }