* adt_debootstrap_opts mentioned in README and passable on

  command lines, instead of unused adt_pbuilder_args.
* Dependency on pbuilder fixed; we use debootstrap, not pbuilder.

diff --git a/debian/changelog b/debian/changelog
index 32f0d221291fc307b543d834a107768d69e88cb9..f447c0703562f27bef6684bea332457fa809cdd1 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+autopkgtest (1.0.1) unstable; urgency=low
+
+  * adt_debootstrap_opts mentioned in README and passable on
+    command lines, instead of unused adt_pbuilder_args.
+  * Dependency on pbuilder fixed; we use debootstrap, not pbuilder.
+
+ -- Ian Jackson <iwj@ubuntu.com>  Thu, 12 Jul 2007 16:54:47 +0100
+
 autopkgtest (1.0.0) gutsy; urgency=low
 
   * Locking: <play>.lock (unlinkable fcntl style) plus <play>/good

diff --git a/debian/control b/debian/control
index 619a3d4fd1b9f207223ea5c9e0077a0feba61d34..8c827072405f333f1245a90765457400d06d3c78 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -23,7 +23,7 @@ Description: automatic as-installed testing for Debian packages
 
 Package: autopkgtest-xenlvm
 Architecture: all
-Depends: pbuilder, libadns1-bin, chiark-utils-bin, iproute, dmsetup
+Depends: debootstrap, libadns1-bin, chiark-utils-bin, iproute, dmsetup
 Recommends: lvm2, debootstrap
 Suggests: autopkgtest
 Description: Xen/LVM2 based testbed snapshot system

diff --git a/xen/README b/xen/README
index 1212187aecf71db6f4b66c2443720a9d187ba519..6a5de75b62135974f8ebf68ed0fc92499dddeba3 100644 (file)
--- a/xen/README
+++ b/xen/README
@@ -137,15 +137,15 @@ adt_lvm_vg                the system's LVM volume group if there is only one
 adt_distro             host system's distribution
        Distribution name (eg, `edgy', `feisty', `sarge', `etch').
 
-adt_pbuilder_args      <none>
-       Extra arguments to pass to pbuilder.
-
 adt_lvm_erasebase      true
        Whether the base filesystem image needs to be filled with
        zeroes.  If you are going to be using the image only locally
        and so don't care whether the base image contains bits of
        previous data from the disk, you may set this to `no'.
 
+adt_debootstrap_opts   <none>
+       Extra options to pass to debootstrap.
+
 adt_debootstrap_includemore    <empty>
 adt_debootstrap_include                libc6-xen,openssh-server,ed
        Comma-separated lists of packages for --include option to

diff --git a/xen/readconfig.in b/xen/readconfig.in
index 62d4cbe28b4b3aba56b0bc0315f523d51b8dfaa3..daef6035ea7e5e4ee456041f22acdb54fa43de4b 100644 (file)
--- a/xen/readconfig.in
+++ b/xen/readconfig.in
@@ -33,6 +33,7 @@ esac
 : ${adt_vm_reduce_retries:=10}
 : ${adt_ssh_keytype:=dsa}
 
+: ${adt_debootstrap_opts:=}
 : ${adt_debootstrap_components:='*'}
 : ${adt_debootstrap_include:=openssh-server,ed}
 : ${adt_debootstrap_includemore:=}