From 5ae355060ece32fd73d93d3c7a29944e2f6a40f6 Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Thu, 12 Jul 2007 16:59:03 +0100 Subject: [PATCH] * 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. --- debian/changelog | 8 ++++++++ debian/control | 2 +- xen/README | 6 +++--- xen/readconfig.in | 1 + 4 files changed, 13 insertions(+), 4 deletions(-) diff --git a/debian/changelog b/debian/changelog index 32f0d22..f447c07 100644 --- 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 Thu, 12 Jul 2007 16:54:47 +0100 + autopkgtest (1.0.0) gutsy; urgency=low * Locking: .lock (unlinkable fcntl style) plus /good diff --git a/debian/control b/debian/control index 619a3d4..8c82707 100644 --- 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 1212187..6a5de75 100644 --- 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 - 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 + Extra options to pass to debootstrap. + adt_debootstrap_includemore 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 62d4cbe..daef603 100644 --- 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:=} -- 2.30.2