X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ian/git?a=blobdiff_plain;f=backup%2Fsnap-common;h=99234b159737be9fed1a80fdb5aa727e43559af4;hb=16d5c02a1c894a2fa2cb31c6e3c916418ce71747;hp=52a2c41c99d9329ac3ccf16d0eadd473a4680e9a;hpb=c6d1694c6a8c80e76d677fafb811bd977ab1da38;p=chiark-utils.git diff --git a/backup/snap-common b/backup/snap-common index 52a2c41..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 + 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