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

[Petter Reinholdtsen]

Author: pere
Date: 2009-06-23 14:08:20 +0000 (Tue, 23 Jun 2009)
New Revision: 1341

Modified:
   sysvinit/trunk/debian/changelog
   sysvinit/trunk/debian/initscripts/etc/init.d/mountall.sh
Log:
Revert commit r1329, to avoid breaking chroot mounts.

Modified: sysvinit/trunk/debian/changelog
===================================================================
--- sysvinit/trunk/debian/changelog	2009-06-23 13:51:39 UTC (rev 1340)
+++ sysvinit/trunk/debian/changelog	2009-06-23 14:08:20 UTC (rev 1341)
@@ -54,9 +54,6 @@
     fakechroot environment. This is done by checking for FAKECHROOT env
     variable before bailing out. Patch thanks to Daniel Kahn Gillmor.
     (Closes: #504877)
-  * Exclude proc from mount_all_local() function of mountall.sh by
-    supplying noproc to the -t cli argument. Thanks Mike Hommey for
-    the patch. (Closes: #425199)
   * Update debian/NOTES to reflect current affairs:
     - sourcing of .sh scripts no longer required by policy nor implimented,
       remove section which tracked 'exit' bugs

Modified: sysvinit/trunk/debian/initscripts/etc/init.d/mountall.sh
===================================================================
--- sysvinit/trunk/debian/initscripts/etc/init.d/mountall.sh	2009-06-23 13:51:39 UTC (rev 1340)
+++ sysvinit/trunk/debian/initscripts/etc/init.d/mountall.sh	2009-06-23 14:08:20 UTC (rev 1341)
@@ -26,7 +26,7 @@
 	# Mount local file systems in /etc/fstab.
 	#
 	mount_all_local() {
-	    mount -a -t noproc,nonfs,nfs4,smbfs,cifs,ncp,ncpfs,coda,ocfs2,gfs,gfs2 \
+	    mount -a -t nonfs,nfs4,smbfs,cifs,ncp,ncpfs,coda,ocfs2,gfs,gfs2 \
 		-O no_netdev
 	}
 	pre_mountall