X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ian/git?p=chiark-utils.git;a=blobdiff_plain;f=backup%2Fsnap-common;h=99234b159737be9fed1a80fdb5aa727e43559af4;hp=f6e788ab975a566f1c5dcad9ce4b17297eea798e;hb=6cc6688a64eb5cea66b114e94c387a57190ff24a;hpb=0d31a244645ed1fec50232ddc31debfb5d38c0f2

diff --git a/backup/snap-common b/backup/snap-common
index f6e788a..99234b1 100644
--- a/backup/snap-common
+++ b/backup/snap-common
@@ -50,10 +50,17 @@ lvmdevice2vgroup () {
 	vgroup="${vgroup%/*}"
 }
 
+daft_sleep () {
+	sleep 5
+}
+
 lvmdropcore () {
 	snmnt="$vardir/snap-mount"
+	daft_sleep
 	umount -v "$snmnt" || true
-	test ! -d "$snmnt" || rmdir -- "$snmnt"
+	daft_sleep
+	test ! -d "$snmnt" || rmdir -- "$snmnt" || rm -f "$snmnt"
+	daft_sleep
 
 	set +e
 	old_lv_dev="$(readlink $vardir/snap-device)"
@@ -62,8 +69,9 @@ lvmdropcore () {
 
 	if [ $rc = 0 ]; then
 		set +e
-		lvchange    $lvm_lvtools_opts -a n $old_lv_dev
+		daft_sleep
 		lvremove -f $lvm_lvtools_opts      $old_lv_dev
+		daft_sleep
 		set -e
 		rm $vardir/snap-device
 	fi