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 e62d5f1053cc4d6daaedfe8df8c2c89475618ce2..0dfd6486ac366a23c8370af118772b30db50fff5 100755 (executable)
--- 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 d846dab74b04900d778beacd0e055f8ccf271aca..eae2111190062f9682e312cb9ff00f91a0e585ed 100644 (file)
--- 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 b24bfd02449aa1f926f612c615cf2979f5bb7f84..c11d0df0015906812d5216c52406dbc6630d7e75 100755 (executable)
--- 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 567e02fe54b42b3fd3a7d8dd7facf6da94144a8b..7db26b6796af6052ae70bdfdc953e74deb2d18e8 100755 (executable)
--- 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]