changes from samual to make it all work

[autopkgtest.git] / xen / cleanup

diff --git a/xen/cleanup b/xen/cleanup
index 145df5e3d3d26a70bd8ac0cffa04126414966eeb..8ce632510852d2e3d72c6dbc32ef18d738b0b7eb 100755 (executable)
--- a/xen/cleanup
+++ b/xen/cleanup
@@ -1,12 +1,17 @@
 #!/bin/bash
 set -e
 . ${ADT_XENLVM_SHARE:=/usr/share/autopkgtest/xenlvm}/readconfig
+test $nonoptargs = 0 || fail "non-option arguments not allowed"
 
 mkdir -p $adt_play $snap
 
-try () { "$@" >/dev/null 2>&1 ||:; }
+try () { printf "%s\n" "- $*"; "$@" >/dev/null 2>&1 ||:; }
 
-try xm destroy $adt_xmname
-try umount $adt_lvm_baselv
+n=0
+while x xm destroy $adt_xmname 2>/dev/null; do
+    sleep $n
+    n=$(( $n+1 ))
+done
+try umount $lvm_baselv_namepath
 try dmsetup remove $adt_devmapper_cowdev
-rm -f $lvfsptr
+rm -f $lvm_fslink_ptr