[Pkg-sysvinit-commits] r828 - in sysvinit/trunk/debian: . initscripts/etc/init.d

[Petter Reinholdtsen]

Author: pere
Date: 2006-09-05 14:22:48 +0000 (Tue, 05 Sep 2006)
New Revision: 828

Modified:
   sysvinit/trunk/debian/changelog
   sysvinit/trunk/debian/initscripts/etc/init.d/mountall.sh
Log:
  * Do not try to mount netdev file systems in mountall.sh. (Closes: #383073)

Modified: sysvinit/trunk/debian/changelog
===================================================================
--- sysvinit/trunk/debian/changelog	2006-09-05 13:50:04 UTC (rev 827)
+++ sysvinit/trunk/debian/changelog	2006-09-05 14:22:48 UTC (rev 828)
@@ -25,6 +25,7 @@
   * Split killall5, last, lastb, mesg and pidof out of the sysvinit
     package into a new sysvutils package to make it easier to replace
     init. (Closes: #385722)
+  * Do not try to mount netdev file systems in mountall.sh. (Closes: #383073)
   * Mount netdev file systems when the network interfaces are enabled.
     (Closes: #383123)
 

Modified: sysvinit/trunk/debian/initscripts/etc/init.d/mountall.sh
===================================================================
--- sysvinit/trunk/debian/initscripts/etc/init.d/mountall.sh	2006-09-05 13:50:04 UTC (rev 827)
+++ sysvinit/trunk/debian/initscripts/etc/init.d/mountall.sh	2006-09-05 14:22:48 UTC (rev 828)
@@ -20,12 +20,16 @@
 	#
 	# Mount local file systems in /etc/fstab.
 	#
+        mount_all_local() {
+	    mount -a -t noproc,nfs,nfs4,smbfs,cifs,ncp,ncpfs,coda,ocfs2,gfs \
+		-O no_netdev
+	}
 	if [ "$VERBOSE" = no ]
 	then
 		log_action_begin_msg "Mounting local filesystems"
 		mount -a -t proc >/dev/null 2>&1  # Ignore error message due to /proc already being mounted
 		ES_TO_REPORT=$?
-		mount -a -t noproc,nfs,nfs4,smbfs,cifs,ncp,ncpfs,coda,ocfs2,gfs
+		mount_all_local
 		ES=$?
 		ES_TO_REPORT=$(($ES_TO_REPORT | $ES))
 		if [ 0 = "$ES_TO_REPORT" ]
@@ -39,7 +43,7 @@
 		mount -a -t proc >/dev/null 2>&1  # Ignore error message due to /proc already being mounted
 		ES=$?
 		[ 0 = "$ES" ] || log_failure_msg "Mounting proc filesystems failed with error code ${ES}."
-		mount -a -v -t noproc,nfs,nfs4,smbfs,cifs,ncp,ncpfs,coda,ocfs2,gfs
+		mount_all_local
 		ES=$?
 		if [ 0 = "$ES" ]
 		then