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

[Thomas Hood]

Author: jdthood-guest
Date: 2005-11-25 19:23:54 +0000 (Fri, 25 Nov 2005)
New Revision: 284

Modified:
   sysvinit/trunk/debian/initscripts/etc/init.d/mountall.sh
   sysvinit/trunk/debian/initscripts/etc/init.d/mountnfs.sh
Log:
Remove unused arguments to bootclean().  Split do_mount out of do_start.  Only run bootclean() again if network filesystems were mounted.

Modified: sysvinit/trunk/debian/initscripts/etc/init.d/mountall.sh
===================================================================
--- sysvinit/trunk/debian/initscripts/etc/init.d/mountall.sh	2005-11-25 19:15:27 UTC (rev 283)
+++ sysvinit/trunk/debian/initscripts/etc/init.d/mountall.sh	2005-11-25 19:23:54 UTC (rev 284)
@@ -19,7 +19,7 @@
 . /etc/init.d/bootclean.sh
 . /lib/lsb/init-functions
 
-do_start () {
+do_mount() {
 	#
 	# Mount local file systems in /etc/fstab.
 	#
@@ -94,9 +94,12 @@
 	then
 		swapon -a -e
 	fi
+}
 
+do_start() {
+	do_mount
 	# Clean /tmp, /var/lock, /var/run
-	bootclean mountall
+	bootclean
 }
 
 case "$1" in

Modified: sysvinit/trunk/debian/initscripts/etc/init.d/mountnfs.sh
===================================================================
--- sysvinit/trunk/debian/initscripts/etc/init.d/mountnfs.sh	2005-11-25 19:15:27 UTC (rev 283)
+++ sysvinit/trunk/debian/initscripts/etc/init.d/mountnfs.sh	2005-11-25 19:23:54 UTC (rev 284)
@@ -23,11 +23,13 @@
 . /etc/init.d/bootclean.sh
 . /lib/lsb/init-functions
 
-do_start () {
+# Return 1 if nothing mounted
+do_mount() {
+	[ -f /etc/fstab ] || return 1
 	#
 	# Run in a subshell because of I/O redirection.
 	#
-	test -f /etc/fstab && (
+	(
 		#
 		# Read through fstab line by line. If it is NFS, set the flag
 		# for mounting NFS file systems. If any NFS partition is found and it
@@ -89,7 +91,7 @@
 				fi
 			fi
 		fi
-		if [ -n "$NETFS" ]
+		if [ "$NETFS" ]
 		then
 			do_mount() { mount -a -t$NETFS ; }
 			
@@ -122,9 +124,12 @@
 			fi
 		fi
 	) < /etc/fstab
+	return 0
+}
 
-	# Clean /tmp, /var/lock, /var/run
-	bootclean mountnfs
+do_start() {
+	# Only bootclean again if we mounted something
+	do_mount && bootclean
 }
 
 case "$1" in