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

[Thomas Hood]

Author: jdthood-guest
Date: 2005-11-25 19:32:02 +0000 (Fri, 25 Nov 2005)
New Revision: 286

Modified:
   sysvinit/trunk/debian/initscripts/etc/init.d/checkroot.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/umountnfs.sh
Log:
Eliminate unnecessary test -n options

Modified: sysvinit/trunk/debian/initscripts/etc/init.d/checkroot.sh
===================================================================
--- sysvinit/trunk/debian/initscripts/etc/init.d/checkroot.sh	2005-11-25 19:28:41 UTC (rev 285)
+++ sysvinit/trunk/debian/initscripts/etc/init.d/checkroot.sh	2005-11-25 19:32:02 UTC (rev 286)
@@ -352,7 +352,7 @@
 	then
 		[ "$roottype" != none ] &&
 			mount -f -o $rootopts -t $roottype $fstabroot /
-		[ -n "$devfs" ] && mount -f $devfs
+		[ "$devfs" ] && mount -f $devfs
 		. /etc/init.d/mountvirtfs
 	fi
 

Modified: sysvinit/trunk/debian/initscripts/etc/init.d/mountnfs.sh
===================================================================
--- sysvinit/trunk/debian/initscripts/etc/init.d/mountnfs.sh	2005-11-25 19:28:41 UTC (rev 285)
+++ sysvinit/trunk/debian/initscripts/etc/init.d/mountnfs.sh	2005-11-25 19:32:02 UTC (rev 286)
@@ -65,7 +65,7 @@
 				fstype=
 				;;
 			esac
-			if [ -n "$fstype" ]
+			if [ "$fstype" ]
 			then
 				case "$NETFS" in
 				  $fstype|*,$fstype|$fstype,*|*,$fstype,*)

Modified: sysvinit/trunk/debian/initscripts/etc/init.d/mountvirtfs
===================================================================
--- sysvinit/trunk/debian/initscripts/etc/init.d/mountvirtfs	2005-11-25 19:28:41 UTC (rev 285)
+++ sysvinit/trunk/debian/initscripts/etc/init.d/mountvirtfs	2005-11-25 19:32:02 UTC (rev 286)
@@ -116,7 +116,7 @@
 		mount $MOUNT_N -t $TYPE $OPTS $4 $TYPE $3
 	else
 		# Only need to update mtab?
-		if [ -n "$DO_MTAB" ] && ! grep -E -sq "^([^ ]+) +$3 +" /etc/mtab
+		if [ "$DO_MTAB" ] && ! grep -E -sq "^([^ ]+) +$3 +" /etc/mtab
 		then
 			mount -f -t $TYPE $OPTS $4 $TYPE $3
 		fi
@@ -141,7 +141,7 @@
 			;;
 	esac
 
-	if [ -n "$DO_MTAB" ] && [ ! -f /etc/mtab ]
+	if [ "$DO_MTAB" ] && [ ! -f /etc/mtab ]
 	then
 		:> /etc/mtab
 	fi
@@ -215,7 +215,7 @@
 	# max size using /etc/default/tmpfs to prevent tmpfs from using
 	# up all system memory.
 	#
-	if [ -n "$TMPFS_SIZE" ]
+	if [ "$TMPFS_SIZE" ]
 	then
 		tmpfs_opt="-osize=${TMPFS_SIZE}"
 	fi

Modified: sysvinit/trunk/debian/initscripts/etc/init.d/umountnfs.sh
===================================================================
--- sysvinit/trunk/debian/initscripts/etc/init.d/umountnfs.sh	2005-11-25 19:28:41 UTC (rev 285)
+++ sysvinit/trunk/debian/initscripts/etc/init.d/umountnfs.sh	2005-11-25 19:32:02 UTC (rev 286)
@@ -61,7 +61,7 @@
 			esac
 		done
 		exec </dev/null
-		if [ -n "$DIRS" ]
+		if [ "$DIRS" ]
 		then
 			umount $FLAGS $DIRS
 		fi