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

[Petter Reinholdtsen]

Author: pere
Date: 2006-09-08 13:59:33 +0000 (Fri, 08 Sep 2006)
New Revision: 877

Modified:
   sysvinit/trunk/debian/changelog
   sysvinit/trunk/debian/initscripts/etc/init.d/umountnfs.sh
Log:
  * Only report umounting of remote file systems when there are remote
    file systems to umount.

Modified: sysvinit/trunk/debian/changelog
===================================================================
--- sysvinit/trunk/debian/changelog	2006-09-08 13:39:45 UTC (rev 876)
+++ sysvinit/trunk/debian/changelog	2006-09-08 13:59:33 UTC (rev 877)
@@ -19,6 +19,8 @@
   * Teach init.d/stop-bootlogd-single to accept the kernel arguments
     'S' and '1' as well as 'single' as single-user mode triggers.
     (Closes: #367465, #372669)
+  * Only report umounting of remote file systems when there are remote
+    file systems to umount.
   * Remove 'S' from default-stop in skeleton.  It never make sense to add
     stop links in rcS.d/.
   * Remove execute bit from /etc/init.d/skeleton. (Closes: #372666)

Modified: sysvinit/trunk/debian/initscripts/etc/init.d/umountnfs.sh
===================================================================
--- sysvinit/trunk/debian/initscripts/etc/init.d/umountnfs.sh	2006-09-08 13:39:45 UTC (rev 876)
+++ sysvinit/trunk/debian/initscripts/etc/init.d/umountnfs.sh	2006-09-08 13:59:33 UTC (rev 877)
@@ -37,8 +37,6 @@
 	# Remove bootclean flag files (precaution against symlink attacks)
 	rm -f /tmp/.clean /var/lock/.clean /var/run/.clean
 
-	[ "$VERBOSE" = no ] || log_action_begin_msg "Unmounting remote and non-toplevel virtual filesystems"
-
 	#
 	# Make list of points to unmount in reverse order of their creation
 	#
@@ -72,11 +70,10 @@
 
 	if [ "$DIRS" ]
 	then
+		[ "$VERBOSE" = no ] || log_action_begin_msg "Unmounting remote and non-toplevel virtual filesystems"
 		umount $FLAGS $DIRS
+		[ "$VERBOSE" = no ] || log_action_end_msg $?
 	fi
-	ES=$?
-
-	[ "$VERBOSE" = no ] || log_action_end_msg $ES
 }
 
 case "$1" in