new purge script

diff --git a/xen/Makefile b/xen/Makefile
index 0eefa8b4c8c2429458d22267666746917eb14bed..7971bcfd149f5b332eb1a3820f25a60b07e48eb4 100644 (file)
--- a/xen/Makefile
+++ b/xen/Makefile
@@ -22,7 +22,7 @@
 
 include ../settings.make
 
-programs =     cleanup setup on-testbed with-testbed
+programs =     cleanup setup on-testbed with-testbed purge
 shareprograms =        fixups fixups-inside
 sharefiles =   readconfig justconfig
 

diff --git a/xen/purge b/xen/purge
new file mode 100755 (executable)
index 0000000..2c89b56
--- /dev/null
+++ b/xen/purge
@@ -0,0 +1,10 @@
+#!/bin/bash
+set -e
+. ${ADT_XENLVM_SHARE:=/usr/share/autopkgtest/xenlvm}/readconfig
+test $nonoptargs = 0 || fail "non-option arguments not allowed"
+
+$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 ||:

diff --git a/xen/setup b/xen/setup
index 72254498b7a0bcd3e7a3ddb752e34b68a66d9c69..d617a88f04fd628bb9c0118cf4947b0485e8abe3 100755 (executable)
--- a/xen/setup
+++ b/xen/setup
@@ -3,11 +3,7 @@ set -e
 . ${ADT_XENLVM_SHARE:=/usr/share/autopkgtest/xenlvm}/readconfig
 test $nonoptargs = 0 || fail "non-option arguments not allowed"
 
-$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/purge
 
 x lvcreate -L $adt_fs_size -n $adt_lvm_baselv $adt_lvm_vg
 x lvcreate -L $adt_fs_snapsize -n $adt_lvm_cowdatalv $adt_lvm_vg