* Install afsd in /sbin rather than /usr/sbin. While putting /usr in

    AFS isn't as common as it once was, no reason to make it harder than
    it needs to be.

diff --git a/debian/changelog b/debian/changelog
index a78efd6c4e8ee9c2964c826d9e0acbcda8671b84..e1eaea75448bd04220d184d53edd188365614dbd 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,9 @@ openafs (1.4rc6-1) unstable; urgency=low
 
   * New upstream version.
     - Builds correctly with 2.6.13 kernels and software suspend.
+  * Install afsd in /sbin rather than /usr/sbin.  While putting /usr in
+    AFS isn't as common as it once was, no reason to make it harder than
+    it needs to be.
 
  --
 

diff --git a/debian/openafs-client.init b/debian/openafs-client.init
index 18d4500e077458e27d6e41688fbcc43c8546f5be..d73f96dc31dcbba54482d833fd9be3c464f97cb8 100755 (executable)
--- a/debian/openafs-client.init
+++ b/debian/openafs-client.init
@@ -124,15 +124,15 @@ choose_afsd_options() {
 }
 
 # Start afsd.  Be careful not to start it if another one is already running,
-# as that has a bad tendency to hang the system.
+# as that has a bad tendency to hang the system.  Earlier versions of the
+# openafs-client package put afsd in /usr/sbin.
 start_client() {
-    if pidof /usr/sbin/afsd >/dev/null ; then
+    if pidof /sbin/afsd >/dev/null || pidof /usr/sbin/afsd >/dev/null ; then
         echo "."
     else
         choose_afsd_options
         echo " afsd."
-        start-stop-daemon --start --quiet --exec /usr/sbin/afsd \
-            -- $AFSD_OPTIONS
+        start-stop-daemon --start --quiet --exec /sbin/afsd -- $AFSD_OPTIONS
     fi
 
     # From /etc/openafs/afs.conf.client, whether to enable fcrypt encryption.
@@ -180,7 +180,7 @@ kill_all_afs() {
 
 case "$1" in 
 start)
-    if is_on $AFS_CLIENT && test -x /usr/sbin/afsd ; then
+    if is_on $AFS_CLIENT && test -x /sbin/afsd ; then
         echo -n "Starting AFS services:"
         if load_client ; then
             start_client
@@ -194,7 +194,7 @@ start)
     ;;
 
 force-start)
-    if test -x /usr/sbin/afsd ; then
+    if test -x /sbin/afsd ; then
         echo -n "Starting AFS services:"
         if load_client ; then
             start_client
@@ -215,6 +215,7 @@ stop|force-stop)
         echo -n " afsd"
     fi
     pidof /usr/sbin/afsd >/dev/null && afsd -shutdown
+    pidof /sbin/afsd >/dev/null && afsd -shutdown
 
     LIBAFS=`/sbin/lsmod | awk 'BEGIN { FS = " " } /openafs/ { print $1 }'`
     if [ -n "$LIBAFS" ] ; then

diff --git a/debian/openafs-client.install b/debian/openafs-client.install
index ed9289b95ffaf8d2366b26063bdd2ce56564c946..ae08ea2b39ccaed0874bf2ebf5d6279f27a48d5f 100644 (file)
--- a/debian/openafs-client.install
+++ b/debian/openafs-client.install
@@ -18,4 +18,4 @@ dest/etc/backup                         usr/sbin
 dest/etc/butc                           usr/sbin
 dest/etc/fms                            usr/sbin
 
-dest/root.client/usr/vice/etc/afsd      usr/sbin
+dest/root.client/usr/vice/etc/afsd      sbin