From: Benjamin Kaduk <kaduk@mit.edu>
Date: Thu, 23 Oct 2014 15:31:39 +0000 (-0400)
Subject: Can't use /var/cache for our data
X-Git-Tag: debian/1.6.10-1~11
X-Git-Url: https://git.michaelhowe.org/gitweb/?a=commitdiff_plain;h=2358796f9700adb96ca713062099ec8fc6249c9e;p=packages%2Fo%2Fopenafs.git

Can't use /var/cache for our data

afsd will overwrite anything it doesn't know about; use
/var/cache/openafs-client for our environment file instead.

Also remove the environment file in the postrm when purging.
---

diff --git a/debian/openafs-client-precheck b/debian/openafs-client-precheck
index e62d5f105..0dfd6486a 100755
--- a/debian/openafs-client-precheck
+++ b/debian/openafs-client-precheck
@@ -71,7 +71,7 @@ case "$AFS_CRYPT" in
 esac
 
 # Generate an EnvironmentFile for use by systemd.
-cat > /var/cache/openafs/openafs-client.env <<EOF
+cat > /var/cache/openafs-client/openafs-client.env <<EOF
 AFSD_ARGS=${AFSD_OPTIONS}
 AFS_SETCRYPT=${AFS_SETCRYPT}
 AFS_SYSNAME=${AFS_SYSNAME}
diff --git a/debian/openafs-client.dirs b/debian/openafs-client.dirs
index d846dab74..eae211119 100644
--- a/debian/openafs-client.dirs
+++ b/debian/openafs-client.dirs
@@ -1,4 +1,5 @@
 var/cache/openafs
+var/cache/openafs-client
 etc/openafs
 etc/init.d
 usr/share/openafs
diff --git a/debian/openafs-client.postrm b/debian/openafs-client.postrm
index b24bfd024..c11d0df00 100755
--- a/debian/openafs-client.postrm
+++ b/debian/openafs-client.postrm
@@ -9,6 +9,7 @@ if [ "$1" = 'purge' ] ; then
     for file in cacheinfo CellServDB ThisCell afs.conf.client ; do
         rm -f "/etc/openafs/$file"
     done
+    rm -f /var/cache/openafs-client/openafs-client.env
 fi
 
 #DEBHELPER#
diff --git a/debian/openafs-client.service b/debian/openafs-client.service
index 567e02fe5..7db26b679 100755
--- a/debian/openafs-client.service
+++ b/debian/openafs-client.service
@@ -14,7 +14,7 @@ ExecStop=/bin/grep -qv ^1$ /proc/sys/kernel/modules_disabled
 ExecStop=/bin/umount -a -t afs
 ExecStop=/bin/umount -af -t afs
 ExecStopPost=/sbin/rmmod openafs
-EnvironmentFile=/var/cache/openafs/openafs-client.env
+EnvironmentFile=/var/cache/openafs-client/openafs-client.env
 KillMode=none
 
 [Install]