* xenlvm command-line settings properly override config file

[autopkgtest.git] / xen / purge

diff --git a/xen/purge b/xen/purge
index 9e03d0ea0f51b9b76d0a5fcacbe30da72e33b393..e2e2a7a5e1fee06f85b29ec24a9a9be08eae31cd 100755 (executable)
--- a/xen/purge
+++ b/xen/purge
@@ -1,12 +1,15 @@
 #!/bin/bash
 set -e
+
+adt_readconfig_needlock=y
 . ${ADT_XENLVM_SHARE:=/usr/share/autopkgtest/xenlvm}/readconfig
 test $nonoptargs = 0 || fail "non-option arguments not allowed"
+rm -f $adt_play/good
 
-$ADT_XENLVM_SHARE/cleanup
-x lvchange -a n $lvm_baselv_namepath ||:
-x lvchange -a n $lvm_cowdata_namepath ||:
-x lvremove $lvm_baselv_namepath ||:
-x lvremove $lvm_cowdata_namepath ||:
+$ADT_XENLVM_SHARE/cleanup "$@"
+xl lvchange -a n $lvm_baselv_namepath ||:
+xl lvchange -a n $lvm_cowdata_namepath ||:
+xl lvremove $lvm_baselv_namepath ||:
+xl lvremove $lvm_cowdata_namepath ||:
 
 rm -rf -- "${adt_play}"