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

[Petter Reinholdtsen]

Author: pere
Date: 2006-09-16 07:43:00 +0000 (Sat, 16 Sep 2006)
New Revision: 929

Modified:
   sysvinit/trunk/debian/changelog
   sysvinit/trunk/debian/initscripts/etc/init.d/checkroot.sh
   sysvinit/trunk/debian/initscripts/etc/init.d/mountdevsubfs.sh
   sysvinit/trunk/debian/initscripts/etc/init.d/mountkernfs.sh
   sysvinit/trunk/debian/initscripts/etc/init.d/mtab.sh
   sysvinit/trunk/debian/initscripts/lib/init/mount-functions.sh
Log:
  * Change mounting of virtual file systems to specify the device name
    explicitly, to make sure /proc/mounts and /etc/mtab end up with
    the same device name.

Modified: sysvinit/trunk/debian/changelog
===================================================================
--- sysvinit/trunk/debian/changelog	2006-09-16 07:17:27 UTC (rev 928)
+++ sysvinit/trunk/debian/changelog	2006-09-16 07:43:00 UTC (rev 929)
@@ -3,6 +3,9 @@
   * Not yet released.
   * Let mountdevsubfs provide mountvirtfs to work with init.d scripts
     with obsolete dependency information.
+  * Change mounting of virtual file systems to specify the device name
+    explicitly, to make sure /proc/mounts and /etc/mtab end up with
+    the same device name.
 
  -- Petter Reinholdtsen <pere at debian.org>  Thu, 14 Sep 2006 15:13:40 +0200
 

Modified: sysvinit/trunk/debian/initscripts/etc/init.d/checkroot.sh
===================================================================
--- sysvinit/trunk/debian/initscripts/etc/init.d/checkroot.sh	2006-09-16 07:17:27 UTC (rev 928)
+++ sysvinit/trunk/debian/initscripts/etc/init.d/checkroot.sh	2006-09-16 07:43:00 UTC (rev 929)
@@ -151,7 +151,7 @@
 				# to have some writable area this
 				# early in the boot.
 				if \
-				        domount tmpfs shmfs /tmp \
+				        domount tmpfs shmfs /tmp tmpfs \
 					&& mknod -m 600 /tmp/rootdev b ${rdev%:*} ${rdev#*:} \
 					&& [ -e /tmp/rootdev ]
 				then

Modified: sysvinit/trunk/debian/initscripts/etc/init.d/mountdevsubfs.sh
===================================================================
--- sysvinit/trunk/debian/initscripts/etc/init.d/mountdevsubfs.sh	2006-09-16 07:17:27 UTC (rev 928)
+++ sysvinit/trunk/debian/initscripts/etc/init.d/mountdevsubfs.sh	2006-09-16 07:43:00 UTC (rev 929)
@@ -33,7 +33,7 @@
 	#
 	SHM_OPT=
 	[ "${SHM_SIZE:=$TMPFS_SIZE}" ] && SHM_OPT=",size=$SHM_SIZE"
-	domount tmpfs shmfs /dev/shm -onoexec,nosuid,nodev$SHM_OPT
+	domount tmpfs shmfs /dev/shm tmpfs -onoexec,nosuid,nodev$SHM_OPT
 
 	#
 	# Mount /dev/pts. Create master ptmx node if needed.
@@ -68,7 +68,7 @@
 					log_warning_msg "Failed making node /dev/ptmx with error code ${ES}."
 				fi
 			fi
-			domount devpts "" /dev/pts -onoexec,nosuid,gid=$TTYGRP,mode=$TTYMODE
+			domount devpts "" /dev/pts devpts -onoexec,nosuid,gid=$TTYGRP,mode=$TTYMODE
 		fi
 	fi
 }

Modified: sysvinit/trunk/debian/initscripts/etc/init.d/mountkernfs.sh
===================================================================
--- sysvinit/trunk/debian/initscripts/etc/init.d/mountkernfs.sh	2006-09-16 07:17:27 UTC (rev 928)
+++ sysvinit/trunk/debian/initscripts/etc/init.d/mountkernfs.sh	2006-09-16 07:43:00 UTC (rev 929)
@@ -20,7 +20,7 @@
 	#
 	# Mount proc filesystem on /proc
 	#
-	domount proc "" /proc -onodev,noexec,nosuid
+	domount proc "" /proc proc -onodev,noexec,nosuid
 
 	#
 	# Mount sysfs on /sys
@@ -28,7 +28,7 @@
 	# Only mount sysfs if it is supported (kernel >= 2.6)
 	if grep -E -qs "sysfs\$" /proc/filesystems
 	then
-		domount sysfs "" /sys -onodev,noexec,nosuid
+		domount sysfs "" /sys sysfs -onodev,noexec,nosuid
 	fi
 
 	#
@@ -43,7 +43,7 @@
 	#
 	if [ -d /proc/bus/usb ]
 	then
-		domount usbfs usbdevfs /proc/bus/usb -onodev,noexec,nosuid
+		domount usbfs usbdevfs /proc/bus/usb usbfs -onodev,noexec,nosuid
 	fi
 }
 

Modified: sysvinit/trunk/debian/initscripts/etc/init.d/mtab.sh
===================================================================
--- sysvinit/trunk/debian/initscripts/etc/init.d/mtab.sh	2006-09-16 07:17:27 UTC (rev 928)
+++ sysvinit/trunk/debian/initscripts/etc/init.d/mtab.sh	2006-09-16 07:43:00 UTC (rev 929)
@@ -110,8 +110,14 @@
 
 	# S02mountkernfs.sh
 	domtab proc /proc "proc" -onodev,noexec,nosuid
-	domtab sysfs /sys "sys" -onodev,noexec,nosuid
-	#domtab usbfs /proc/bus/usb "procbususb" -- disabled in development
+	if grep -E -qs "sysfs\$" /proc/filesystems
+        then
+		domtab sysfs /sys "sys" -onodev,noexec,nosuid
+	fi
+	if [ -d /proc/bus/usb ]
+	then
+		domtab usbfs /proc/bus/usb "procbususb"
+	fi
 
 	# S03udev
 	domtab tmpfs /dev "udev" -omode=0755

Modified: sysvinit/trunk/debian/initscripts/lib/init/mount-functions.sh
===================================================================
--- sysvinit/trunk/debian/initscripts/lib/init/mount-functions.sh	2006-09-16 07:17:27 UTC (rev 928)
+++ sysvinit/trunk/debian/initscripts/lib/init/mount-functions.sh	2006-09-16 07:43:00 UTC (rev 929)
@@ -29,7 +29,8 @@
 # $1: file system type
 # $2: alternative file system type (or empty string if none)
 # $3: mount point
-# $4... : extra mount program options
+# $4: mount device name
+# $5... : extra mount program options
 domount () {
 	MTPT="$3"
 	KERNEL="$(uname -s)"
@@ -61,6 +62,14 @@
 		return
 	fi
 
+	# We give file system type as device name if not specified as
+	# an argument
+	if [ "$4" ] ; then
+	    DEVNAME=$4
+	else
+	    DEVNAME=$FSTYPE
+	fi
+
 	# Get the options from /etc/fstab.
 	OPTS=
 	if [ -f /etc/fstab ]
@@ -98,11 +107,10 @@
 		return # Already mounted
 	fi
 
-	# We give file system type as device name
 	if [ "$VERBOSE" != "no" ]; then
 		is_empty_dir "$MTPT" >/dev/null 2>&1 || log_warning_msg "Files under mount point '$MTPT' will be hidden."
 	fi
-	mount -n -t $FSTYPE $OPTS $4 $FSTYPE $MTPT
+	mount -n -t $FSTYPE $OPTS $5 $DEVNAME $MTPT
 }
 
 pre_mountall ()