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

[Petter Reinholdtsen]

Author: pere
Date: 2006-10-06 15:22:11 +0000 (Fri, 06 Oct 2006)
New Revision: 1011

Modified:
   sysvinit/trunk/debian/changelog
   sysvinit/trunk/debian/initscripts/etc/init.d/mtab.sh
   sysvinit/trunk/debian/initscripts/etc/init.d/umountfs
Log:
  * Do not insert /dev/.static/dev in /etc/mtab, and do not try to
    umount it either.  Avoids confusing users. (Closes: #?)

Modified: sysvinit/trunk/debian/changelog
===================================================================
--- sysvinit/trunk/debian/changelog	2006-10-04 18:40:24 UTC (rev 1010)
+++ sysvinit/trunk/debian/changelog	2006-10-06 15:22:11 UTC (rev 1011)
@@ -1,3 +1,10 @@
+sysvinit (2.86.ds1-33~1) unstable; urgency=low
+
+  * Do not insert /dev/.static/dev in /etc/mtab, and do not try to
+    umount it either.  Avoids confusing users. (Closes: #?)
+
+ -- Petter Reinholdtsen <pere at debian.org>  Fri,  6 Oct 2006 17:21:27 +0200
+
 sysvinit (2.86.ds1-32) unstable; urgency=low
 
   * Set SE context on /dev/pts and /dev/ptm if they are created by

Modified: sysvinit/trunk/debian/initscripts/etc/init.d/mtab.sh
===================================================================
--- sysvinit/trunk/debian/initscripts/etc/init.d/mtab.sh	2006-10-04 18:40:24 UTC (rev 1010)
+++ sysvinit/trunk/debian/initscripts/etc/init.d/mtab.sh	2006-10-06 15:22:11 UTC (rev 1011)
@@ -153,6 +153,12 @@
 			/lib/modules/*/volatile)
 				FDEV="lrm"
 				;;
+			/dev/.static/dev)
+				# Not really useful to show in 'df',
+				# and it isn't accessible for non-root
+				# users.
+				continue
+				;;
 		esac
 		domtab "$FTYPE" "$FDIR" "$FDEV" "-o$FOPTS"
 	done

Modified: sysvinit/trunk/debian/initscripts/etc/init.d/umountfs
===================================================================
--- sysvinit/trunk/debian/initscripts/etc/init.d/umountfs	2006-10-04 18:40:24 UTC (rev 1010)
+++ sysvinit/trunk/debian/initscripts/etc/init.d/umountfs	2006-10-06 15:22:11 UTC (rev 1011)
@@ -66,7 +66,7 @@
 	while read DEV MTPT FSTYPE REST
 	do
 		case "$MTPT" in
-		  /|/proc|/dev|/.dev|/dev/pts|/dev/shm|/proc/*|/sys|/lib/init/rw)
+		  /|/proc|/dev|/.dev|/dev/pts|/dev/shm|/dev/.static/dev|/proc/*|/sys|/lib/init/rw)
 			continue
 			;;
 		  /var/run)