From: Russ Allbery <rra@debian.org>
Date: Tue, 19 Jun 2007 11:02:27 +0000 (+0000)
Subject: * Move upserver and upclient to /usr/lib/openafs (from /usr/sbin) to
X-Git-Tag: debian/1.4.4.dfsg1-4~4
X-Git-Url: https://git.michaelhowe.org/gitweb/?a=commitdiff_plain;h=4832aec585f9996f92ad4859fe301e3bcc7af794;p=packages%2Fo%2Fopenafs.git

* Move upserver and upclient to /usr/lib/openafs (from /usr/sbin) to
  match upstream's layout and for consistency with the other servers run
  via bosserver.
---

diff --git a/debian/changelog b/debian/changelog
index d65288821..ec4834a0f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -10,11 +10,14 @@ openafs (1.4.4.dfsg1-4) UNRELEASED; urgency=low
     files, and the file server has to write to this directory to start (so
     having it in /etc breaks read-only / file systems).  Thanks, Alexei
     Sheplyakov.  (Closes: #405697)
+  * Move upserver and upclient to /usr/lib/openafs (from /usr/sbin) to
+    match upstream's layout and for consistency with the other servers run
+    via bosserver.
   * Go back to using krb5-config.  The dependency problem has now been
     fixed on all platforms in the krb5 package and this is the preferred
     upstream method.
 
- -- Russ Allbery <rra@debian.org>  Tue, 19 Jun 2007 02:07:20 -0700
+ -- Russ Allbery <rra@debian.org>  Tue, 19 Jun 2007 04:03:44 -0700
 
 openafs (1.4.4.dfsg1-3) unstable; urgency=low
 
diff --git a/debian/openafs-fileserver.install b/debian/openafs-fileserver.install
index 7c1338999..3fe61b923 100644
--- a/debian/openafs-fileserver.install
+++ b/debian/openafs-fileserver.install
@@ -2,10 +2,10 @@ debian/tmp/usr/sbin/bosserver           usr/sbin
 debian/tmp/usr/sbin/voldump             usr/sbin
 debian/tmp/usr/sbin/volinfo             usr/sbin
 
-debian/tmp/usr/lib/openafs/up*          usr/sbin
-
 debian/tmp/usr/lib/openafs/fileserver   usr/lib/openafs
 debian/tmp/usr/lib/openafs/salvager     usr/lib/openafs
+debian/tmp/usr/lib/openafs/upclient     usr/lib/openafs
+debian/tmp/usr/lib/openafs/upserver     usr/lib/openafs
 debian/tmp/usr/lib/openafs/volserver    usr/lib/openafs
 
 debian/tmp/usr/share/man/man5/BosConfig.5             usr/share/man/man5
diff --git a/debian/openafs-fileserver.postinst b/debian/openafs-fileserver.postinst
index 7ea6b705c..cd1be200b 100644
--- a/debian/openafs-fileserver.postinst
+++ b/debian/openafs-fileserver.postinst
@@ -31,12 +31,20 @@ configure)
     # Move the contents of the old /etc/openafs/server-local directory into
     # /var/lib/openafs/local.  Most of the files in this directory are
     # automatically generated, so it didn't belong in /etc.
+    #
+    # Change the paths to upserver and upclient in BosConfig from older
+    # versions that had the binaries in /usr/sbin.
     if [ "x$2" != "x" ] && dpkg --compare-versions $2 lt 1.4.4.dfsg1-4 ; then
         for f in sysid sysid.old NetInfo NetRestrict ; do
             if [ -e "/etc/openafs/server-local/$f" ] ; then
                 cp "/etc/openafs/server-local/$f" "/var/lib/openafs/local/$f"
             fi
         done
+        if [ -e /etc/openafs/BosConfig ] ; then
+            sed -i -e 's,/usr/sbin/upserver,/usr/lib/openafs/upserver,' \
+                   -e 's,/usr/sbin/upclient,/usr/lib/openafs/upclient,' \
+                       /etc/openafs/BosConfig
+        fi
     fi
     db_stop
     ;;