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

[Thomas Hood]

Author: jdthood-guest
Date: 2005-11-24 15:05:27 +0000 (Thu, 24 Nov 2005)
New Revision: 247

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/functions.sh
   sysvinit/trunk/debian/initscripts/etc/init.d/halt
   sysvinit/trunk/debian/initscripts/etc/init.d/mountvirtfs
   sysvinit/trunk/debian/initscripts/etc/init.d/reboot
   sysvinit/trunk/debian/initscripts/etc/init.d/rmnologin
   sysvinit/trunk/debian/initscripts/etc/init.d/sendsigs
   sysvinit/trunk/debian/initscripts/etc/init.d/single
   sysvinit/trunk/debian/initscripts/etc/init.d/umountfs
   sysvinit/trunk/debian/initscripts/etc/init.d/umountnfs.sh
   sysvinit/trunk/debian/initscripts/etc/init.d/umountroot
   sysvinit/trunk/debian/initscripts/etc/init.d/urandom
Log:
General cleanup

Modified: sysvinit/trunk/debian/initscripts/etc/init.d/bootclean.sh
===================================================================
--- sysvinit/trunk/debian/initscripts/etc/init.d/bootclean.sh	2005-11-24 15:05:17 UTC (rev 246)
+++ sysvinit/trunk/debian/initscripts/etc/init.d/bootclean.sh	2005-11-24 15:05:27 UTC (rev 247)
@@ -2,9 +2,12 @@
 # bootclean.sh	Functions to clean /tmp, /var/run and /var/lock.
 #
 
-. /lib/lsb/init-functions
+[ "$VERBOSE" ] || VERBOSE=yes
+
 [ -f /etc/default/rcS ] && . /etc/default/rcS
 
+. /lib/lsb/init-functions
+
 cleantmp() {
 	[ -f /tmp/.clean ] && return
 	[ -z "$TMPTIME" ] && TMPTIME=0

Modified: sysvinit/trunk/debian/initscripts/etc/init.d/bootmisc.sh
===================================================================
--- sysvinit/trunk/debian/initscripts/etc/init.d/bootmisc.sh	2005-11-24 15:05:17 UTC (rev 246)
+++ sysvinit/trunk/debian/initscripts/etc/init.d/bootmisc.sh	2005-11-24 15:05:27 UTC (rev 247)
@@ -9,8 +9,9 @@
 # Description:
 ### END INIT INFO
 
-[ -z "$DELAYLOGIN" ] && DELAYLOGIN=yes
-[ -z "$EDITMOTD" ] && EDITMOTD=yes
+[ "$DELAYLOGIN" ] || DELAYLOGIN=yes
+[ "$EDITMOTD" ] || EDITMOTD=yes
+
 [ -f /etc/default/rcS ] && . /etc/default/rcS
 
 do_start () {

Modified: sysvinit/trunk/debian/initscripts/etc/init.d/checkfs.sh
===================================================================
--- sysvinit/trunk/debian/initscripts/etc/init.d/checkfs.sh	2005-11-24 15:05:17 UTC (rev 246)
+++ sysvinit/trunk/debian/initscripts/etc/init.d/checkfs.sh	2005-11-24 15:05:27 UTC (rev 247)
@@ -11,7 +11,10 @@
 ### END INIT INFO
 
 [ "$FSCKFIX" ] || FSCKFIX=no
+[ "$VERBOSE" ] || VERBOSE=yes
+
 [ -f /etc/default/rcS ] && . /etc/default/rcS
+
 . /lib/lsb/init-functions
 . /lib/init/functions.sh
 

Modified: sysvinit/trunk/debian/initscripts/etc/init.d/checkroot.sh
===================================================================
--- sysvinit/trunk/debian/initscripts/etc/init.d/checkroot.sh	2005-11-24 15:05:17 UTC (rev 246)
+++ sysvinit/trunk/debian/initscripts/etc/init.d/checkroot.sh	2005-11-24 15:05:27 UTC (rev 247)
@@ -10,8 +10,9 @@
 # Short-Description: Check to root file system.
 ### END INIT INFO
 
-[ -z "$SULOGIN" ] && SULOGIN=no
-[ -z "$VERBOSE" ] && VERBOSE=yes
+[ "$SULOGIN" ] || SULOGIN=no
+[ "$VERBOSE" ] || VERBOSE=yes
+
 [ -f /etc/default/rcS ] && . /etc/default/rcS
 
 PATH=/lib/init:/bin:/sbin

Modified: sysvinit/trunk/debian/initscripts/etc/init.d/functions.sh
===================================================================
--- sysvinit/trunk/debian/initscripts/etc/init.d/functions.sh	2005-11-24 15:05:17 UTC (rev 246)
+++ sysvinit/trunk/debian/initscripts/etc/init.d/functions.sh	2005-11-24 15:05:27 UTC (rev 247)
@@ -5,6 +5,7 @@
 # by the scripts in the initscripts package.
 #
 
+# Deprecated
 dir_writable () {
 	if [ -d "$1/" ] && [ -w "$1/" ] && touch -a "$1/" 2>/dev/null
 	then

Modified: sysvinit/trunk/debian/initscripts/etc/init.d/halt
===================================================================
--- sysvinit/trunk/debian/initscripts/etc/init.d/halt	2005-11-24 15:05:17 UTC (rev 246)
+++ sysvinit/trunk/debian/initscripts/etc/init.d/halt	2005-11-24 15:05:27 UTC (rev 247)
@@ -12,11 +12,11 @@
 ### END INIT INFO
 
 PATH=/sbin:/bin:/usr/sbin:/usr/bin
-. /lib/lsb/init-functions
 
-# Get the default from /etc/default/halt.
 [ -f /etc/default/halt ] && . /etc/default/halt
 
+. /lib/lsb/init-functions
+
 do_stop () {
 	if [ "$INIT_HALT" = "" ]
 	then

Modified: sysvinit/trunk/debian/initscripts/etc/init.d/mountvirtfs
===================================================================
--- sysvinit/trunk/debian/initscripts/etc/init.d/mountvirtfs	2005-11-24 15:05:17 UTC (rev 246)
+++ sysvinit/trunk/debian/initscripts/etc/init.d/mountvirtfs	2005-11-24 15:05:27 UTC (rev 247)
@@ -19,7 +19,7 @@
 ### END INIT INFO
 
 # Script needs to be robust and continue when parts fail,
-# so we're not setting the "-e" flag.
+# so we're NOT setting the "-e" flag.
 #set -e
 
 PATH=/lib/init:/bin:/sbin

Modified: sysvinit/trunk/debian/initscripts/etc/init.d/reboot
===================================================================
--- sysvinit/trunk/debian/initscripts/etc/init.d/reboot	2005-11-24 15:05:17 UTC (rev 246)
+++ sysvinit/trunk/debian/initscripts/etc/init.d/reboot	2005-11-24 15:05:27 UTC (rev 247)
@@ -11,6 +11,7 @@
 ### END INIT INFO
 
 PATH=/sbin:/bin:/usr/sbin:/usr/bin
+
 . /lib/lsb/init-functions
 
 do_stop () {

Modified: sysvinit/trunk/debian/initscripts/etc/init.d/rmnologin
===================================================================
--- sysvinit/trunk/debian/initscripts/etc/init.d/rmnologin	2005-11-24 15:05:17 UTC (rev 246)
+++ sysvinit/trunk/debian/initscripts/etc/init.d/rmnologin	2005-11-24 15:05:27 UTC (rev 247)
@@ -13,10 +13,11 @@
 #                    bootmisc earlier in the boot process.
 ### END INIT INFO
 
-[ -z "$DELAYLOGIN" ] && DELAYLOGIN=yes
+[ "$DELAYLOGIN" ] || DELAYLOGIN=yes
+PATH=/lib/init:/sbin:/bin
+
 [ -f /etc/default/rcS ] && . /etc/default/rcS
 
-PATH=/lib/init:/sbin:/bin
 
 do_start () {
 	case "$DELAYLOGIN" in

Modified: sysvinit/trunk/debian/initscripts/etc/init.d/sendsigs
===================================================================
--- sysvinit/trunk/debian/initscripts/etc/init.d/sendsigs	2005-11-24 15:05:17 UTC (rev 246)
+++ sysvinit/trunk/debian/initscripts/etc/init.d/sendsigs	2005-11-24 15:05:27 UTC (rev 247)
@@ -10,6 +10,7 @@
 ### END INIT INFO
 
 PATH=/sbin:/bin:/usr/sbin:/usr/bin
+
 . /lib/lsb/init-functions
 
 do_stop () {

Modified: sysvinit/trunk/debian/initscripts/etc/init.d/single
===================================================================
--- sysvinit/trunk/debian/initscripts/etc/init.d/single	2005-11-24 15:05:17 UTC (rev 246)
+++ sysvinit/trunk/debian/initscripts/etc/init.d/single	2005-11-24 15:05:27 UTC (rev 247)
@@ -9,6 +9,7 @@
 ### END INIT INFO
 
 PATH="/sbin:/bin:/usr/sbin:/usr/bin"
+
 . /lib/lsb/init-functions
 
 do_start () {

Modified: sysvinit/trunk/debian/initscripts/etc/init.d/umountfs
===================================================================
--- sysvinit/trunk/debian/initscripts/etc/init.d/umountfs	2005-11-24 15:05:17 UTC (rev 246)
+++ sysvinit/trunk/debian/initscripts/etc/init.d/umountfs	2005-11-24 15:05:27 UTC (rev 247)
@@ -10,7 +10,9 @@
 ### END INIT INFO
 
 PATH=/sbin:/bin:/usr/sbin:/usr/bin
+
 umask 022
+
 . /lib/lsb/init-functions
 
 do_stop () {

Modified: sysvinit/trunk/debian/initscripts/etc/init.d/umountnfs.sh
===================================================================
--- sysvinit/trunk/debian/initscripts/etc/init.d/umountnfs.sh	2005-11-24 15:05:17 UTC (rev 246)
+++ sysvinit/trunk/debian/initscripts/etc/init.d/umountnfs.sh	2005-11-24 15:05:27 UTC (rev 247)
@@ -12,11 +12,11 @@
 
 PATH=/sbin:/bin:/usr/sbin:/usr/bin
 
-. /lib/lsb/init-functions
-
 KERNEL=`uname -s`
 RELEASE=`uname -r`
 
+. /lib/lsb/init-functions
+
 case "${KERNEL}:${RELEASE}" in
   Linux:[01].*|Linux:2.[01].*)
 	FLAGS=""

Modified: sysvinit/trunk/debian/initscripts/etc/init.d/umountroot
===================================================================
--- sysvinit/trunk/debian/initscripts/etc/init.d/umountroot	2005-11-24 15:05:17 UTC (rev 246)
+++ sysvinit/trunk/debian/initscripts/etc/init.d/umountroot	2005-11-24 15:05:27 UTC (rev 247)
@@ -9,9 +9,10 @@
 ### END INIT INFO
 
 PATH=/sbin:/bin
+[ "$VERBOSE" ] || VERBOSE=yes
 
-[ -z "$VERBOSE" ] && VERBOSE=yes
 [ -f /etc/default/rcS ] && . /etc/default/rcS
+
 . /lib/lsb/init-functions
 
 do_stop () {

Modified: sysvinit/trunk/debian/initscripts/etc/init.d/urandom
===================================================================
--- sysvinit/trunk/debian/initscripts/etc/init.d/urandom	2005-11-24 15:05:17 UTC (rev 246)
+++ sysvinit/trunk/debian/initscripts/etc/init.d/urandom	2005-11-24 15:05:27 UTC (rev 247)
@@ -12,7 +12,8 @@
 
 [ -c /dev/urandom ] || exit 0
 
-[ -z "$VERBOSE" ] && VERBOSE=yes
+[ "$VERBOSE" ] || VERBOSE=yes
+
 [ -f /etc/default/rcS ] && . /etc/default/rcS
 
 . /lib/lsb/init-functions