From 69e27922912586be35fad5c4a42be2071a05baa2 Mon Sep 17 00:00:00 2001
From: Ian Jackson <ian@anarres>
Date: Wed, 31 Jan 2007 15:41:05 +0000
Subject: [PATCH] new purge script

---
 xen/Makefile |  2 +-
 xen/purge    | 10 ++++++++++
 xen/setup    |  6 +-----
 3 files changed, 12 insertions(+), 6 deletions(-)
 create mode 100755 xen/purge

diff --git a/xen/Makefile b/xen/Makefile
index 0eefa8b..7971bcf 100644
--- 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
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 7225449..d617a88 100755
--- 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
-- 
2.30.2