* Try harder to remove /etc/openafs and /var/lib/openafs in the postrm

  for openafs-fileserver.  (Closes: #454694)

diff --git a/debian/changelog b/debian/changelog
index 5e31c573d05f0365584654b65febf40c9ee5e246..dc089308f6edaa8e4e1650a6d6d56f4b5c5113ef 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+openafs (1.4.6.dfsg1-2) UNRELEASED; urgency=low
+
+  * Try harder to remove /etc/openafs and /var/lib/openafs in the postrm
+    for openafs-fileserver.  (Closes: #454694)
+
+ -- Russ Allbery <rra@debian.org>  Sat, 29 Dec 2007 20:33:30 -0800
+
 openafs (1.4.6.dfsg1-1) unstable; urgency=low
 
   * New upstream release.

diff --git a/debian/openafs-fileserver.postrm b/debian/openafs-fileserver.postrm
index ff59a1f2da1596595a4a11e3a636f3643dfdd45a..0f17ae9f5dc1ac2a7eef89fd6996b6a6cc4f11f2 100644 (file)
--- a/debian/openafs-fileserver.postrm
+++ b/debian/openafs-fileserver.postrm
@@ -17,10 +17,12 @@ purge)
     for file in CellServDB CellServDB.old KeyFile ThisCell UserList ; do
         rm -f "/etc/openafs/server/$file"
     done
+    rm -f /etc/openafs/BosConfig
+    rmdir --parents --ignore-fail-on-non-empty /etc/openafs/server
     for file in SALVAGE.fs fssync.sock salvage.lock sysid sysid.old ; do
         rm -f "/var/lib/openafs/local/$file"
     done
-    rm -f /etc/openafs/BosConfig
+    rmdir --parents --ignore-fail-on-non-empty /var/lib/openafs/local
     ;;
 
 remove|upgrade|failed-upgrade|abort-install|abort-upgrade|disappear)