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

[Petter Reinholdtsen]

Author: pere
Date: 2006-10-06 17:44:45 +0000 (Fri, 06 Oct 2006)
New Revision: 1015

Modified:
   sysvinit/trunk/debian/changelog
   sysvinit/trunk/debian/initscripts/etc/init.d/umountnfs.sh
Log:
  * Adjust how fuser is called by umountnfs, using the exit code from
    fuser instead of looking at its output. Based on patch from Markus
    Schoder. (Closes: 390936)

Modified: sysvinit/trunk/debian/changelog
===================================================================
--- sysvinit/trunk/debian/changelog	2006-10-06 17:37:02 UTC (rev 1014)
+++ sysvinit/trunk/debian/changelog	2006-10-06 17:44:45 UTC (rev 1015)
@@ -6,6 +6,9 @@
     mountdevsub.sh from mtab.sh. (Closes: #391312)
   * Do not fail to install initscripts even if /lib/init/rw/ can
     not be mounted. (Closes: #391115)
+  * Adjust how fuser is called by umountnfs, using the exit code from
+    fuser instead of looking at its output. Based on patch from Markus
+    Schoder. (Closes: 390936)
 
  -- Petter Reinholdtsen <pere at debian.org>  Fri,  6 Oct 2006 17:21:27 +0200
 

Modified: sysvinit/trunk/debian/initscripts/etc/init.d/umountnfs.sh
===================================================================
--- sysvinit/trunk/debian/initscripts/etc/init.d/umountnfs.sh	2006-10-06 17:37:02 UTC (rev 1014)
+++ sysvinit/trunk/debian/initscripts/etc/init.d/umountnfs.sh	2006-10-06 17:44:45 UTC (rev 1015)
@@ -84,18 +84,17 @@
 		# Kill all processes using the directories we try to umount
 		if [ -x /bin/fuser ] ; then
 			[ "$VERBOSE" = no ] || log_action_begin_msg "Asking non-system processes to terminate"
-			fuser -k -INT -m $DIRS
+			fuser -s -k -INT -m $DIRS
 			[ "$VERBOSE" = no ] || log_action_end_msg 0
 
 			for count in 1 2 3 4 5; do # Wait up to 5 seconds
 			    sleep 1
-			    [ -z "`fuser -m $DIRS 2> /dev/null`" ] && break
+			    fuser -s -m $DIRS || break
 			done
 
-			pidsleft=`fuser -m $DIRS 2>/dev/null`
-			if [ "$pidsleft" ] ; then
+			if fuser -s -m $DIRS; then
 			    [ "$VERBOSE" = no ] || log_action_begin_msg "Killing non-system processes"
-			    fuser -k -TERM -m $DIRS
+			    fuser -s -k -TERM -m $DIRS
 			    [ "$VERBOSE" = no ] || log_action_end_msg 0
 			fi
 		else