From: Ian Jackson <ian@anarres>
Date: Wed, 31 Jan 2007 17:33:01 +0000 (+0000)
Subject: more sensible snap size; purge really purges; update and install gdebi in fixup
X-Git-Tag: converted-from-bzr~32^3~59
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=0d4c095968d6fde58628a943eec25a804070bd47;p=autopkgtest.git

more sensible snap size; purge really purges; update and install gdebi in fixup
---

diff --git a/xen/README b/xen/README
index faefe2d..93022b2 100644
--- a/xen/README
+++ b/xen/README
@@ -46,6 +46,10 @@ In some more detail, there are four main programs provided:
 	and it is desirable to reclaim any resources used by the
 	testbed, cleanup will do this job.
 
+  adt-xenlvm-purge [<config settings>]
+	Deletes all of the data for the testbed.  Ie, undoes
+	the effects of adt-xenlvm-setup.
+
 In each case [<config settings>] is zero or more arguments of the form
   --<config-var>=<value>
 where <config-var> is one of the configuration items listed below.
diff --git a/xen/fixups-inside b/xen/fixups-inside
index d4aae6d..d35a03d 100755
--- a/xen/fixups-inside
+++ b/xen/fixups-inside
@@ -66,4 +66,7 @@ if [ x"$adt_normaluser" != x ]; then
 		--disabled-password ${adt_normaluser}
 fi
 
+apt-get update
+apt-get -y install gdebi-core || apt-get -y install gdebi
+
 echo '---)'
diff --git a/xen/purge b/xen/purge
index 2c89b56..9e03d0e 100755
--- a/xen/purge
+++ b/xen/purge
@@ -8,3 +8,5 @@ x lvchange -a n $lvm_baselv_namepath ||:
 x lvchange -a n $lvm_cowdata_namepath ||:
 x lvremove $lvm_baselv_namepath ||:
 x lvremove $lvm_cowdata_namepath ||:
+
+rm -rf -- "${adt_play}"
diff --git a/xen/readconfig.in b/xen/readconfig.in
index 56c0657..7ed706b 100644
--- a/xen/readconfig.in
+++ b/xen/readconfig.in
@@ -23,8 +23,8 @@ esac
 adt_nominum=adt
 adt_testbed_ram=256
 adt_freeze_ram=32
-adt_fs_size=1G
-adt_fs_snapsize=100M
+adt_fs_size=3072M
+adt_fs_snapsize=2560M
 adt_fs_cowchunk=8
 adt_playbase=/var/lib/autopkgtest/xenlvm
 adt_fs_type=ext3