* xenlvm command-line settings properly override config file

  settings everywhere.
* Default value for adt_distro computed in time to be used for
  default value for adt_play.
* Close fd 4 for lvm tools too (suppresses daft `File descriptor
  left open' message).

diff --git a/debian/changelog b/debian/changelog
index f447c0703562f27bef6684bea332457fa809cdd1..f7df3b1553b22441c6460b604246e2be8e21d31c 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,14 @@
+autopkgtest (1.0.2~) unstable; urgency=low
+
+  * xenlvm command-line settings properly override config file
+    settings everywhere.
+  * Default value for adt_distro computed in time to be used for
+    default value for adt_play.
+  * Close fd 4 for lvm tools too (suppresses daft `File descriptor
+    left open' message).
+
+ -- Ian Jackson <ian@davenant.greenend.org.uk>  Fri, 13 Jul 2007 15:31:58 +0100
+
 autopkgtest (1.0.1) unstable; urgency=low
 
   * adt_debootstrap_opts mentioned in README and passable on

diff --git a/xen/purge b/xen/purge
index 02bcee6a0b1d65a7557a9fc76105197295ec617e..e2e2a7a5e1fee06f85b29ec24a9a9be08eae31cd 100755 (executable)
--- a/xen/purge
+++ b/xen/purge
@@ -6,7 +6,7 @@ adt_readconfig_needlock=y
 test $nonoptargs = 0 || fail "non-option arguments not allowed"
 rm -f $adt_play/good
 
-$ADT_XENLVM_SHARE/cleanup
+$ADT_XENLVM_SHARE/cleanup "$@"
 xl lvchange -a n $lvm_baselv_namepath ||:
 xl lvchange -a n $lvm_cowdata_namepath ||:
 xl lvremove $lvm_baselv_namepath ||:

diff --git a/xen/readconfig.in b/xen/readconfig.in
index daef6035ea7e5e4ee456041f22acdb54fa43de4b..a96af499f3bfca57b368ea98ef7949a11050cca8 100644 (file)
--- a/xen/readconfig.in
+++ b/xen/readconfig.in
@@ -12,7 +12,7 @@ fail () {
 }
 
 x () { echo "x $*"; "$@"; }
-xl () { echo "xl $*"; 3>&- "$@"; }
+xl () { echo "x $*"; 3>&- 4>&- "$@"; }
 
 case "$BASH_VERSION" in
 '')    fail 'scripts using adtxenlvm readconfig must be bash scripts' ;;
@@ -87,11 +87,6 @@ cmdline_args "$@"
 
 #---------- settings needed for locking ----------
 
-# In-host-file-system playground
-: ${adt_play:=${adt_playbase}/${adt_nominum}_${adt_distro}}
-: ${adt_xmconfig:=${adt_play}/xmconfig}
-: ${adt_lock:=${adt_play}.lock}
-
 if [ ! "${adt_readconfig_initscript}" ]; then
  case "$adt_distro" in
  '')
@@ -105,6 +100,11 @@ if [ ! "${adt_readconfig_initscript}" ]; then
  esac
 fi
 
+# In-host-file-system playground
+: ${adt_play:=${adt_playbase}/${adt_nominum}_${adt_distro}}
+: ${adt_xmconfig:=${adt_play}/xmconfig}
+: ${adt_lock:=${adt_play}.lock}
+
 if [ "${adt_readconfig_needlock}" ] &&
    [ "x${adt_lock}" != xnone ] && \
    [ "x${ADT_LOCKED}" != "x$adt_lock" ]; then

diff --git a/xen/setup b/xen/setup
index d73358c7f9086ec3306f06154d43018e2a0207bf..5a9f0b0c60c4f2185c32885329507a8bfe964535 100755 (executable)
--- a/xen/setup
+++ b/xen/setup
@@ -5,7 +5,7 @@ adt_readconfig_needlock=y
 . ${ADT_XENLVM_SHARE:=/usr/share/autopkgtest/xenlvm}/readconfig
 test $nonoptargs = 0 || fail "non-option arguments not allowed"
 
-$ADT_XENLVM_SHARE/purge
+$ADT_XENLVM_SHARE/purge "$@"
 
 xl lvcreate -L $adt_fs_size -n $adt_lvm_baselv $adt_lvm_vg
 xl lvcreate -L $adt_fs_snapsize -n $adt_lvm_cowdatalv $adt_lvm_vg
@@ -80,7 +80,7 @@ fi
 
 while true; do
        if ping -c 1 $adt_guest_ipaddr && \
-          /usr/share/autopkgtest/xenlvm/on-testbed '
+          /usr/share/autopkgtest/xenlvm/on-testbed "$@" '
                set -e; umask 002; cd /var/lib;
                mkdir -p autopkgtest; cd autopkgtest;
                touch xenlvm-created