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

[Petter Reinholdtsen]

Author: pere
Date: 2006-11-26 19:38:54 +0100 (Sun, 26 Nov 2006)
New Revision: 1040

Modified:
   sysvinit/trunk/debian/changelog
   sysvinit/trunk/debian/initscripts/etc/init.d/sendsigs
   sysvinit/trunk/debian/initscripts/etc/init.d/umountnfs.sh
   sysvinit/trunk/debian/initscripts/postinst
Log:
  * Undo use of fuser to kill processes in umountnfs before unmounting
    partitions, as it will kill init and /etc/init.d/rc during
    shutdown if root is on NFS or tmpfs file systems are bind-mounted
    into chroots.  Use sendsigs and move it before umountnfs, and thus
    reopen bugs #258420, #367944.  (Closes: #392861)

Modified: sysvinit/trunk/debian/changelog
===================================================================
--- sysvinit/trunk/debian/changelog	2006-11-26 15:17:38 UTC (rev 1039)
+++ sysvinit/trunk/debian/changelog	2006-11-26 18:38:54 UTC (rev 1040)
@@ -14,6 +14,11 @@
     on patch from David Härdeman. (Closes: #397525).
   * Fix typo in message added in 91_sulogin_lockedpw.dpatch.
     Thanks to Robert Bihlmeyer.  (Closes: #399715)
+  * Undo use of fuser to kill processes in umountnfs before unmounting
+    partitions, as it will kill init and /etc/init.d/rc during
+    shutdown if root is on NFS or tmpfs file systems are bind-mounted
+    into chroots.  Use sendsigs and move it before umountnfs, and thus
+    reopen bugs #258420, #367944.  (Closes: #392861)
 
  -- Petter Reinholdtsen <pere at debian.org>  Sat, 25 Nov 2006 10:22:13 +0100
 

Modified: sysvinit/trunk/debian/initscripts/etc/init.d/sendsigs
===================================================================
--- sysvinit/trunk/debian/initscripts/etc/init.d/sendsigs	2006-11-26 15:17:38 UTC (rev 1039)
+++ sysvinit/trunk/debian/initscripts/etc/init.d/sendsigs	2006-11-26 18:38:54 UTC (rev 1040)
@@ -2,7 +2,7 @@
 ### BEGIN INIT INFO
 # Provides:          sendsigs
 # Required-Start:    
-# Required-Stop:     umountfs
+# Required-Stop:     umountnfs
 # Default-Start:
 # Default-Stop:      0 6
 # Short-Description: Kill all remaining processes.

Modified: sysvinit/trunk/debian/initscripts/etc/init.d/umountnfs.sh
===================================================================
--- sysvinit/trunk/debian/initscripts/etc/init.d/umountnfs.sh	2006-11-26 15:17:38 UTC (rev 1039)
+++ sysvinit/trunk/debian/initscripts/etc/init.d/umountnfs.sh	2006-11-26 18:38:54 UTC (rev 1040)
@@ -2,7 +2,7 @@
 ### BEGIN INIT INFO
 # Provides:          umountnfs
 # Required-Start:
-# Required-Stop:     umountfs sendsigs
+# Required-Stop:     umountfs
 # Should-Stop:       portmap $network
 # Default-Start:
 # Default-Stop:      0 6
@@ -81,30 +81,6 @@
 
 	if [ "$DIRS" ]
 	then
-		# 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 -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
-			    fuser -s -m $DIRS || break
-			done
-
-			if fuser -s -m $DIRS; then
-			    [ "$VERBOSE" = no ] || log_action_begin_msg "Killing non-system processes"
-			    fuser -s -k -TERM -m $DIRS
-			    [ "$VERBOSE" = no ] || log_action_end_msg 0
-			fi
-		else
-		    log_warning_msg "Missing fuser, using sendsigs to kill all programs"
-		    log_warning_msg "Install psmisc if you want to kill only processes"
-		    log_warning_msg "using the remote and non-toplevel virtual file systems"
-		    log_warning_msg "before umounting them."
-		    /etc/init.d/sendsigs stop
-		fi
-
 		[ "$VERBOSE" = no ] || log_action_begin_msg "Unmounting remote and non-toplevel virtual filesystems"
 		umount $FLAGS $DIRS
 		ES=$?

Modified: sysvinit/trunk/debian/initscripts/postinst
===================================================================
--- sysvinit/trunk/debian/initscripts/postinst	2006-11-26 15:17:38 UTC (rev 1039)
+++ sysvinit/trunk/debian/initscripts/postinst	2006-11-26 18:38:54 UTC (rev 1040)
@@ -100,8 +100,9 @@
 	update-rc.d -f hostname.sh remove >/dev/null 2>&1 || :
 fi
 
-# In 2.86.ds1-21, the sendsigs script were moved.
-if dpkg --compare-versions "$PREV_VER" lt "2.86.ds1-21"
+# In 2.86.ds1-21, the sendsigs script were moved, and in 2.86.ds1-35
+# it was moved back.
+if dpkg --compare-versions "$PREV_VER" lt "2.86.ds1-35"
 then
 	update-rc.d -f sendsigs remove >/dev/null 2>&1 || :
 fi
@@ -135,8 +136,8 @@
 updatercd reboot                 start 90 6 .
 updatercd umountroot             start 60 0 6 .
 updatercd umountfs               start 40 0 6 .
-updatercd sendsigs               start 37 0 6 .
 updatercd umountnfs.sh           start 31 0 6 .
+updatercd sendsigs               start 20 0 6 .
 
 updatercd killprocs              start 30 1 .
 updatercd single                 start 90 1 .