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

[Thomas Hood]

Author: jdthood-guest
Date: 2006-01-10 19:45:27 +0000 (Tue, 10 Jan 2006)
New Revision: 574

Modified:
   sysvinit/trunk/debian/initscripts/etc/init.d/mountvirtfs
   sysvinit/trunk/debian/initscripts/lib/init/mount-functions.sh
Log:
Tweak (cont'd)

Modified: sysvinit/trunk/debian/initscripts/etc/init.d/mountvirtfs
===================================================================
--- sysvinit/trunk/debian/initscripts/etc/init.d/mountvirtfs	2006-01-10 19:44:13 UTC (rev 573)
+++ sysvinit/trunk/debian/initscripts/etc/init.d/mountvirtfs	2006-01-10 19:45:27 UTC (rev 574)
@@ -5,20 +5,13 @@
 # Required-Stop:
 # Default-Start:     S
 # Default-Stop:
-# Short-Description: Mount virtual file systems.
-# Description:       Mount virtual file systems.
-#
-#                    This script can be called several times without
-#                    damage; it tries to mount the filesystems
-#                    only if not mounted yet, and only updates /etc/mtab
-#                    if it is writable and there is a need to.
-#
-#                    This functionality was previously provided by
-#                    mountkernfs from the glibc package.
+# Short-Description: Mount kernel virtual file systems.
+# Description:       Mount initial set of virtual filesystems the kernel
+#                    provides and that are required by everything.
 ### END INIT INFO
 
 # Script needs to be robust and continue when parts fail,
-# so we're NOT setting the "-e" flag.
+# so we're NOT setting the "-e" option.
 
 PATH=/lib/init:/bin:/sbin
 
@@ -75,7 +68,7 @@
 	#
 	# Mount proc filesystem on /proc
 	#
-	initfunc_domount proc "" /proc
+	domount proc "" /proc
 
 	#
 	# Mount sysfs on /sys
@@ -83,7 +76,7 @@
 	# Only mount sysfs if it is supported (kernel >= 2.6)
 	if grep -E -qs "sysfs\$" /proc/filesystems
 	then
-		initfunc_domount sysfs "" /sys
+		domount sysfs "" /sys
 	fi
 
 	#
@@ -98,7 +91,7 @@
 	#
 	if [ -d /proc/bus/usb ]
 	then
-		initfunc_domount usbfs usbdevfs /proc/bus/usb
+		domount usbfs usbdevfs /proc/bus/usb
 	fi
 }
 

Modified: sysvinit/trunk/debian/initscripts/lib/init/mount-functions.sh
===================================================================
--- sysvinit/trunk/debian/initscripts/lib/init/mount-functions.sh	2006-01-10 19:44:13 UTC (rev 573)
+++ sysvinit/trunk/debian/initscripts/lib/init/mount-functions.sh	2006-01-10 19:45:27 UTC (rev 574)
@@ -22,7 +22,7 @@
 # $2: alternative file system type (or empty string if none)
 # $3: mount point
 # $4 and up: extra mount program options
-initfunc_domount () {
+domount () {
 	MTPT="$3"
 	KERNEL="$(uname -s)"
 	# Figure out filesystem type