chiark
/
gitweb
/
~ian
/
chiark-utils.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
xduplic-copier: Print error message, rather than segfaulting, if XOpenDisplay fails.
[chiark-utils.git]
/
backup
/
snap-common
diff --git
a/backup/snap-common
b/backup/snap-common
index f6e788ab975a566f1c5dcad9ce4b17297eea798e..99234b159737be9fed1a80fdb5aa727e43559af4 100644
(file)
--- a/
backup/snap-common
+++ b/
backup/snap-common
@@
-50,10
+50,17
@@
lvmdevice2vgroup () {
vgroup="${vgroup%/*}"
}
vgroup="${vgroup%/*}"
}
+daft_sleep () {
+ sleep 5
+}
+
lvmdropcore () {
snmnt="$vardir/snap-mount"
lvmdropcore () {
snmnt="$vardir/snap-mount"
+ daft_sleep
umount -v "$snmnt" || true
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)"
set +e
old_lv_dev="$(readlink $vardir/snap-device)"
@@
-62,8
+69,9
@@
lvmdropcore () {
if [ $rc = 0 ]; then
set +e
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
lvremove -f $lvm_lvtools_opts $old_lv_dev
+ daft_sleep
set -e
rm $vardir/snap-device
fi
set -e
rm $vardir/snap-device
fi