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

[Petter Reinholdtsen]

Author: pere
Date: 2006-09-11 22:14:48 +0000 (Mon, 11 Sep 2006)
New Revision: 913

Modified:
   sysvinit/trunk/debian/changelog
   sysvinit/trunk/debian/initscripts/etc/init.d/mountall.sh
Log:
  * Now that mtab is properly updated by mtab.sh before mountall.sh,
    there is no need to have special handling of proc file systems.
    Remove it. (Closes: #359651)

Modified: sysvinit/trunk/debian/changelog
===================================================================
--- sysvinit/trunk/debian/changelog	2006-09-11 20:02:04 UTC (rev 912)
+++ sysvinit/trunk/debian/changelog	2006-09-11 22:14:48 UTC (rev 913)
@@ -17,6 +17,9 @@
     processes to kill to make this possible.
   * Modify mtab.sh to include /dev/.static/dev in /etc/mtab, to avoid
     message from umountfs during shutdown about it being missing in mtab.
+  * Now that mtab is properly updated by mtab.sh before mountall.sh,
+    there is no need to have special handling of proc file systems.
+    Remove it. (Closes: #359651)
 
  -- Petter Reinholdtsen <pere at debian.org>  Mon, 11 Sep 2006 00:44:44 +0200
 

Modified: sysvinit/trunk/debian/initscripts/etc/init.d/mountall.sh
===================================================================
--- sysvinit/trunk/debian/initscripts/etc/init.d/mountall.sh	2006-09-11 20:02:04 UTC (rev 912)
+++ sysvinit/trunk/debian/initscripts/etc/init.d/mountall.sh	2006-09-11 22:14:48 UTC (rev 913)
@@ -22,29 +22,17 @@
 	# Mount local file systems in /etc/fstab.
 	#
 	mount_all_local() {
-	    mount -a -t noproc,nfs,nfs4,smbfs,cifs,ncp,ncpfs,coda,ocfs2,gfs \
+	    mount -a -t nfs,nfs4,smbfs,cifs,ncp,ncpfs,coda,ocfs2,gfs \
 		-O no_netdev
 	}
 	pre_mountall
 	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_all_local
-		ES=$?
-		ES_TO_REPORT=$(($ES_TO_REPORT | $ES))
-		if [ 0 = "$ES_TO_REPORT" ]
-		then
-			log_action_end_msg 0
-		else
-			log_action_end_msg 1 "code $ES_TO_REPORT"
-		fi
+		log_action_end_msg $?
 	else
 		log_daemon_msg "Will now mount local filesystems"
-		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_all_local
 		log_end_msg $?
 	fi