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

[Petter Reinholdtsen]

Author: pere
Date: 2009-07-07 10:16:19 +0000 (Tue, 07 Jul 2009)
New Revision: 1377

Modified:
   sysvinit/trunk/debian/changelog
   sysvinit/trunk/debian/initscripts/etc/init.d/umountfs
   sysvinit/trunk/debian/initscripts/etc/init.d/umountnfs.sh
Log:
Rewrite umountfs and umountnfs.sh to use fstab-decode, to handle
mount points with space in their names (Closes: #415482).

Modified: sysvinit/trunk/debian/changelog
===================================================================
--- sysvinit/trunk/debian/changelog	2009-07-06 23:15:03 UTC (rev 1376)
+++ sysvinit/trunk/debian/changelog	2009-07-07 10:16:19 UTC (rev 1377)
@@ -24,6 +24,8 @@
     its handling of symlinks.  Patch from Bill Nottingham and Fedora.
   * New patch 94_fstab-decode adding helper program fstab-decode to
     sysvinit-utils.  Source from the initscripts package in Fedora.
+  * Rewrite umountfs and umountnfs.sh to use fstab-decode, to handle
+    mount points with space in their names (Closes: #415482).
 
  -- Petter Reinholdtsen <pere at debian.org>  Wed, 01 Jul 2009 20:04:20 +0200
 

Modified: sysvinit/trunk/debian/initscripts/etc/init.d/umountfs
===================================================================
--- sysvinit/trunk/debian/initscripts/etc/init.d/umountfs	2009-07-06 23:15:03 UTC (rev 1376)
+++ sysvinit/trunk/debian/initscripts/etc/init.d/umountfs	2009-07-07 10:16:19 UTC (rev 1377)
@@ -21,7 +21,7 @@
 
 	REG_MTPTS=""
 	TMPFS_MTPTS=""
-	while read DEV MTPT FSTYPE REST
+	while read -r DEV MTPT FSTYPE REST
 	do
 		case "$MTPT" in
 		  /|/proc|/dev|/.dev|/dev/pts|/dev/shm|/dev/.static/dev|/proc/*|/sys|/lib/init/rw)
@@ -63,11 +63,11 @@
 		if [ "$VERBOSE" = no ]
 		then
 			log_action_begin_msg "Unmounting temporary filesystems"
-			umount $TMPFS_MTPTS
+			fstab-decode umount $TMPFS_MTPTS
 			log_action_end_msg $?
 		else
 			log_daemon_msg "Will now unmount temporary filesystems"
-			umount -v $TMPFS_MTPTS
+			fstab-decode umount -v $TMPFS_MTPTS
 			log_end_msg $?
 		fi
 	fi
@@ -94,11 +94,11 @@
 		if [ "$VERBOSE" = no ]
 		then
 			log_action_begin_msg "Unmounting local filesystems"
-			umount -f -r -d $REG_MTPTS
+			fstab-decode umount -f -r -d $REG_MTPTS
 			log_action_end_msg $?
 		else
 			log_daemon_msg "Will now unmount local filesystems"
-			umount -f -v -r -d $REG_MTPTS
+			fstab-decode umount -f -v -r -d $REG_MTPTS
 			log_end_msg $?
 		fi
 	fi

Modified: sysvinit/trunk/debian/initscripts/etc/init.d/umountnfs.sh
===================================================================
--- sysvinit/trunk/debian/initscripts/etc/init.d/umountnfs.sh	2009-07-06 23:15:03 UTC (rev 1376)
+++ sysvinit/trunk/debian/initscripts/etc/init.d/umountnfs.sh	2009-07-07 10:16:19 UTC (rev 1377)
@@ -45,7 +45,7 @@
 	exec 9<&0 </etc/mtab
 
 	DIRS=""
-	while read DEV MTPT FSTYPE OPTS REST
+	while read -r DEV MTPT FSTYPE OPTS REST
 	do
 		case "$MTPT" in
 		  /|/proc|/dev|/dev/pts|/dev/shm|/proc/*|/sys|/lib/init/rw)
@@ -82,7 +82,7 @@
 	if [ "$DIRS" ]
 	then
 		[ "$VERBOSE" = no ] || log_action_begin_msg "Unmounting remote and non-toplevel virtual filesystems"
-		umount $FLAGS $DIRS
+		fstab-decode umount $FLAGS $DIRS
 		ES=$?
 		[ "$VERBOSE" = no ] || log_action_end_msg $ES
 	fi