From: Russ Allbery <rra@debian.org>
Date: Thu, 17 May 2007 01:14:14 +0000 (+0000)
Subject: * When afsd is started with -rmtsys, it starts another process that afsd
X-Git-Tag: debian/1.4.4.dfsg1-3
X-Git-Url: https://git.michaelhowe.org/gitweb/?a=commitdiff_plain;h=6a1fb425f0ae25cf137d42edb2bf7b7e75d3eff8;p=packages%2Fo%2Fopenafs.git

* 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 918f6b399..08c86763b 100644
--- 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 a96d92251..7d7cac9bd 100755
--- 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