[Pkg-sysvinit-commits] r297 - sysvinit/trunk/debian/initscripts/etc/init.d

[Thomas Hood]

Author: jdthood-guest
Date: 2005-11-27 12:48:45 +0000 (Sun, 27 Nov 2005)
New Revision: 297

Modified:
   sysvinit/trunk/debian/initscripts/etc/init.d/bootclean.sh
   sysvinit/trunk/debian/initscripts/etc/init.d/bootmisc.sh
   sysvinit/trunk/debian/initscripts/etc/init.d/checkfs.sh
   sysvinit/trunk/debian/initscripts/etc/init.d/checkroot.sh
   sysvinit/trunk/debian/initscripts/etc/init.d/mountall.sh
   sysvinit/trunk/debian/initscripts/etc/init.d/mountnfs.sh
   sysvinit/trunk/debian/initscripts/etc/init.d/mountvirtfs
   sysvinit/trunk/debian/initscripts/etc/init.d/rmnologin
   sysvinit/trunk/debian/initscripts/etc/init.d/umountroot
   sysvinit/trunk/debian/initscripts/etc/init.d/urandom
Log:
Consolidate variable setting

Modified: sysvinit/trunk/debian/initscripts/etc/init.d/bootclean.sh
===================================================================
--- sysvinit/trunk/debian/initscripts/etc/init.d/bootclean.sh	2005-11-27 12:31:11 UTC (rev 296)
+++ sysvinit/trunk/debian/initscripts/etc/init.d/bootclean.sh	2005-11-27 12:48:45 UTC (rev 297)
@@ -94,9 +94,10 @@
 	#
 	[ -f /var/run/.clean ] && return
 	[ "$VERBOSE" != no ] && log_action_begin_msg "Cleaning /var/run"
-	( cd /var/run && \
-		find . ! -type d ! -name utmp ! -name innd.pid \
-		-exec rm -f -- {} \; )
+	(
+		cd /var/run && \
+		find . ! -type d ! -name utmp ! -name innd.pid -exec rm -f -- {} \;
+	)
 	rm -f /var/run/.clean
 	set -o noclobber
 	:> /var/run/.clean
@@ -129,7 +130,10 @@
 		fi
 	done
 
-	if [ -f /tmp/.clean ] && [ -f /var/run/.clean ] && [ -f /var/lock/.clean ]
+	if \
+		[ -f /tmp/.clean ] \
+		&& [ -f /var/run/.clean ] \
+		&& [ -f /var/lock/.clean ]
 	then
 		return
 	fi

Modified: sysvinit/trunk/debian/initscripts/etc/init.d/bootmisc.sh
===================================================================
--- sysvinit/trunk/debian/initscripts/etc/init.d/bootmisc.sh	2005-11-27 12:31:11 UTC (rev 296)
+++ sysvinit/trunk/debian/initscripts/etc/init.d/bootmisc.sh	2005-11-27 12:48:45 UTC (rev 297)
@@ -11,8 +11,7 @@
 
 [ "$DELAYLOGIN" ] || DELAYLOGIN=yes
 [ "$EDITMOTD" ] || EDITMOTD=yes
-[ -f /etc/default/rcS ] && . /etc/default/rcS
-. /lib/init/set-rcS-vars.sh
+. /lib/init/vars.sh
 
 do_start () {
 	# Put a nologin file in /etc to prevent people from logging in

Modified: sysvinit/trunk/debian/initscripts/etc/init.d/checkfs.sh
===================================================================
--- sysvinit/trunk/debian/initscripts/etc/init.d/checkfs.sh	2005-11-27 12:31:11 UTC (rev 296)
+++ sysvinit/trunk/debian/initscripts/etc/init.d/checkfs.sh	2005-11-27 12:48:45 UTC (rev 297)
@@ -13,9 +13,7 @@
 PATH=/bin:/sbin
 FSCK_LOGFILE=/var/log/fsck/checkfs
 [ "$FSCKFIX" ] || FSCKFIX=no
-[ "$VERBOSE" ] || VERBOSE=yes
-[ -f /etc/default/rcS ] && . /etc/default/rcS
-. /lib/init/set-rcS-vars.sh
+. /lib/init/vars.sh
 
 . /lib/init/functions.sh
 . /lib/lsb/init-functions

Modified: sysvinit/trunk/debian/initscripts/etc/init.d/checkroot.sh
===================================================================
--- sysvinit/trunk/debian/initscripts/etc/init.d/checkroot.sh	2005-11-27 12:31:11 UTC (rev 296)
+++ sysvinit/trunk/debian/initscripts/etc/init.d/checkroot.sh	2005-11-27 12:48:45 UTC (rev 297)
@@ -14,9 +14,7 @@
 FSCK_LOGFILE=/var/log/fsck/checkroot
 [ "$FSCKFIX" ] || FSCKFIX=no
 [ "$SULOGIN" ] || SULOGIN=no
-[ "$VERBOSE" ] || VERBOSE=yes
-[ -f /etc/default/rcS ] && . /etc/default/rcS
-. /lib/init/set-rcS-vars.sh
+. /lib/init/vars.sh
 
 . /lib/init/functions.sh
 . /lib/lsb/init-functions

Modified: sysvinit/trunk/debian/initscripts/etc/init.d/mountall.sh
===================================================================
--- sysvinit/trunk/debian/initscripts/etc/init.d/mountall.sh	2005-11-27 12:31:11 UTC (rev 296)
+++ sysvinit/trunk/debian/initscripts/etc/init.d/mountall.sh	2005-11-27 12:48:45 UTC (rev 297)
@@ -12,9 +12,7 @@
 ### END INIT INFO
 
 [ "$TMPTIME" ] || TMPTIME=0
-[ "$VERBOSE" ] || VERBOSE=yes
-[ -f /etc/default/rcS ] && . /etc/default/rcS
-. /lib/init/set-rcS-vars.sh
+. /lib/init/vars.sh
 
 . /etc/init.d/bootclean.sh
 . /lib/lsb/init-functions

Modified: sysvinit/trunk/debian/initscripts/etc/init.d/mountnfs.sh
===================================================================
--- sysvinit/trunk/debian/initscripts/etc/init.d/mountnfs.sh	2005-11-27 12:31:11 UTC (rev 296)
+++ sysvinit/trunk/debian/initscripts/etc/init.d/mountnfs.sh	2005-11-27 12:48:45 UTC (rev 297)
@@ -16,9 +16,7 @@
 ### END INIT INFO
 
 [ "TMPTIME" ] || TMPTIME=0
-[ "$VERBOSE" ] || VERBOSE=yes
-[ -f /etc/default/rcS ] && . /etc/default/rcS
-. /lib/init/set-rcS-vars.sh
+. /lib/init/vars.sh
 
 . /etc/init.d/bootclean.sh
 . /lib/lsb/init-functions

Modified: sysvinit/trunk/debian/initscripts/etc/init.d/mountvirtfs
===================================================================
--- sysvinit/trunk/debian/initscripts/etc/init.d/mountvirtfs	2005-11-27 12:31:11 UTC (rev 296)
+++ sysvinit/trunk/debian/initscripts/etc/init.d/mountvirtfs	2005-11-27 12:48:45 UTC (rev 297)
@@ -20,7 +20,6 @@
 
 # Script needs to be robust and continue when parts fail,
 # so we're NOT setting the "-e" flag.
-#set -e
 
 PATH=/lib/init:/bin:/sbin
 

Modified: sysvinit/trunk/debian/initscripts/etc/init.d/rmnologin
===================================================================
--- sysvinit/trunk/debian/initscripts/etc/init.d/rmnologin	2005-11-27 12:31:11 UTC (rev 296)
+++ sysvinit/trunk/debian/initscripts/etc/init.d/rmnologin	2005-11-27 12:48:45 UTC (rev 297)
@@ -15,8 +15,7 @@
 
 PATH=/lib/init:/sbin:/bin
 [ "$DELAYLOGIN" ] || DELAYLOGIN=yes
-[ -f /etc/default/rcS ] && . /etc/default/rcS
-. /lib/init/set-rcS-vars.sh
+. /lib/init/vars.sh
 
 do_start () {
 	case "$DELAYLOGIN" in

Modified: sysvinit/trunk/debian/initscripts/etc/init.d/umountroot
===================================================================
--- sysvinit/trunk/debian/initscripts/etc/init.d/umountroot	2005-11-27 12:31:11 UTC (rev 296)
+++ sysvinit/trunk/debian/initscripts/etc/init.d/umountroot	2005-11-27 12:48:45 UTC (rev 297)
@@ -9,9 +9,7 @@
 ### END INIT INFO
 
 PATH=/sbin:/bin
-[ "$VERBOSE" ] || VERBOSE=yes
-[ -f /etc/default/rcS ] && . /etc/default/rcS
-. /lib/init/set-rcS-vars.sh
+. /lib/init/vars.sh
 
 . /lib/lsb/init-functions
 

Modified: sysvinit/trunk/debian/initscripts/etc/init.d/urandom
===================================================================
--- sysvinit/trunk/debian/initscripts/etc/init.d/urandom	2005-11-27 12:31:11 UTC (rev 296)
+++ sysvinit/trunk/debian/initscripts/etc/init.d/urandom	2005-11-27 12:48:45 UTC (rev 297)
@@ -12,9 +12,7 @@
 
 [ -c /dev/urandom ] || exit 0
 
-[ "$VERBOSE" ] || VERBOSE=yes
-[ -f /etc/default/rcS ] && . /etc/default/rcS
-. /lib/init/set-rcS-vars.sh
+. /lib/init/vars.sh
 
 . /lib/lsb/init-functions