* chiark-backup: remove snap-mount properly whether it's a dir or a leaf

  node (such as a symlink).

diff --git a/backup/nosnap b/backup/nosnap
index c1f16dd59bc8fec36d92f3ceb795fa302b864411..b9d57ab21edf166d342c6c83c5e90ed97d061f97 100755 (executable)
--- a/backup/nosnap
+++ b/backup/nosnap
@@ -3,7 +3,12 @@
 set -e
 
 removes () {
-       rm -f -- "$vardir/snap-mount" "$vardir/snap-device"
+       if test -d "$vardir/snap-mount"; then
+               rmdir -- "$vardir/snap-mount"
+       else
+               rm -f -- "$vardir/snap-mount"
+       fi
+       rm -f -- "$vardir/snap-device"
 }
 
 vardir="$2"

diff --git a/backup/snap-common b/backup/snap-common
index f6e788ab975a566f1c5dcad9ce4b17297eea798e..52a2c41c99d9329ac3ccf16d0eadd473a4680e9a 100644 (file)
--- a/backup/snap-common
+++ b/backup/snap-common
@@ -53,7 +53,7 @@ lvmdevice2vgroup () {
 lvmdropcore () {
        snmnt="$vardir/snap-mount"
        umount -v "$snmnt" || true
-       test ! -d "$snmnt" || rmdir -- "$snmnt"
+       test ! -d "$snmnt" || rmdir -- "$snmnt" || rm -f "$snmnt"
 
        set +e
        old_lv_dev="$(readlink $vardir/snap-device)"

diff --git a/debian/changelog b/debian/changelog
index 25c885dcc949448525b23890977bdb629a9493d3..d2fd9860867d82826ed52b67f0241991b55f1705 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+chiark-utils (4.1.25) unstable; urgency=low
+
+  * chiark-backup: remove snap-mount properly whether it's a dir or a leaf
+    node (such as a symlink).
+
+ -- Ian Jackson <ian@davenant.greenend.org.uk>  Mon, 26 Nov 2007 00:52:23 +0000
+
 chiark-utils (4.1.24) unstable; urgency=low
 
   * Change my email address in the Maintainer field so that