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

diff --git a/xen/README b/xen/README
index faefe2de224ea72f73be12125d555d55996b3a83..93022b21df6791cf9580e23a7ab0476e79a1c314 100644 (file)
--- 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 d4aae6d9640bdcaddba745f6faaf69e7ef8972d3..d35a03d677d5050a98cb722298b7469c705e69da 100755 (executable)
--- 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 2c89b56da640e14bd3c17eaaa43dd8d104c60c5c..9e03d0ea0f51b9b76d0a5fcacbe30da72e33b393 100755 (executable)
--- 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 56c0657a20fdac7959b339e8250537a8d010607d..7ed706be621f39178623031b303c0396bf7feabd 100644 (file)
--- 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