* When afsd is started with -rmtsys, it starts another process that afsd

  -shutdown doesn't kill.  Update the init script to kill this process
  on stop.  (Closes: #405982)

diff --git a/debian/changelog b/debian/changelog
index 918f6b3990807d984e718dbd28317e3eaee0e040..08c86763bdc49d69d564a1aa50cd2e740babe62f 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,13 +4,16 @@ openafs (1.4.4.dfsg1-3) unstable; urgency=low
     don't think we have any network interfaces.  Otherwise, the client
     will use an all-zeroes UUID, which will collide with every other
     client with the same problem.
+  * When afsd is started with -rmtsys, it starts another process that afsd
+    -shutdown doesn't kill.  Update the init script to kill this process
+    on stop.  (Closes: #405982)
   * Don't use krb5-config to get a library list.  It runs the risk of
     encoding unnecessary library dependencies.  Instead, hard-code the
     flags and libraries we actually need.  (Closes: #424448)
   * When loading a module using the upstream naming convention, don't
     append the .mp to the module name for modprobe.  (Closes: #420597)
 
- -- Russ Allbery <rra@debian.org>  Wed, 16 May 2007 16:56:46 -0700
+ -- Russ Allbery <rra@debian.org>  Wed, 16 May 2007 18:16:12 -0700
 
 openafs (1.4.4.dfsg1-2) unstable; urgency=low
 

diff --git a/debian/openafs-client.init b/debian/openafs-client.init
index a96d92251cc666518bc932a6d6aaf085852666fc..7d7cac9bd50d73cdcfee924ff48b4f9a4423d931 100755 (executable)
--- a/debian/openafs-client.init
+++ b/debian/openafs-client.init
@@ -218,8 +218,14 @@ stop|force-stop)
         umount /afs
         echo -n " afsd"
     fi
-    pidof /usr/sbin/afsd >/dev/null && afsd -shutdown
-    pidof /sbin/afsd >/dev/null && afsd -shutdown
+    if pidof /usr/sbin/afsd >/dev/null || pidof /sbin/afsd >/dev/null ; then
+         afsd -shutdown
+    fi
+
+    # If running with the -rmtsys option, afsd doesn't kill the rmtsys helper
+    # on afsd -shutdown.  Run start-stop-daemon to make sure that everything
+    # is dead.
+    start-stop-daemon --stop --quiet --name afsd
 
     LIBAFS=`/sbin/lsmod | awk 'BEGIN { FS = " " } /openafs/ { print $1 }'`
     if [ -n "$LIBAFS" ] ; then