* Set DEBIAN_FRONTEND=noninteractive.

* Run udevsettle after xm destroy but before dmsetup remove.

diff --git a/debian/changelog b/debian/changelog
index bd212f312d44e0a187c20925571ad88a350f8c54..13b75b2adbb77c58b375081fb4e996c793f17c8c 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -12,6 +12,8 @@ autopkgtest (0.7.2~~iwj) unstable; urgency=low
     for something that looks like a Xen kernel rather than guessing
     from the filename since the filenames seem unstable.
   * Default setting for adt_fw_allowglobalports is none.
+  * Set DEBIAN_FRONTEND=noninteractive.
+  * Run udevsettle after xm destroy but before dmsetup remove.
 
  --
 

diff --git a/xen/cleanup b/xen/cleanup
index 76a9a23e7901a21e3187ff0606b91599a7be1c63..de08ded67ca74dd26bc456c2a4085e65f7f26f9f 100755 (executable)
--- a/xen/cleanup
+++ b/xen/cleanup
@@ -8,7 +8,7 @@ mkdir -p $adt_play $snap
 try () { printf "%s\n" "- $*"; "$@" >/dev/null 2>&1 ||:; }
 
 n=0
-if xm destroy $adt_xmname 2>/dev/null; then sleep 5; fi
+if xm destroy $adt_xmname 2>/dev/null; then do_udevsettle; fi
 try umount $lvm_baselv_namepath
 try dmsetup remove $adt_devmapper_cowdev
 rm -f $lvm_fslink_ptr

diff --git a/xen/readconfig.in b/xen/readconfig.in
index 17a692b5f7a86476dce1476eaa3c6dda82587fc0..ee10c20a6f930824c91720a52abde3c44e6d0f9e 100644 (file)
--- a/xen/readconfig.in
+++ b/xen/readconfig.in
@@ -13,6 +13,14 @@ fail () {
 
 x () { echo "x $*"; "$@"; }
 
+do_udevsettle () {
+       if type udevsettle >/dev/null 2>&1; then
+               udevsettle
+       elif test -x /sbin/udevsettle; then
+               udevsettle
+       fi
+}              
+               
 case "$BASH_VERSION" in
 '')    fail 'scripts using adtxenlvm readconfig must be bash scripts' ;;
 *)     ;;
@@ -40,7 +48,7 @@ adt_debootstrap_script=''
 
 adt_fw_localmirrors=''
 adt_fw_prohibnets='192.168.0.0/24 172.16.0.0/12 10.0.0.0/8'
-adt_fw_allowglobalports=''
+adt_fw_allowglobalports='80'
 
 adt_guest_macaddr=00:16:3e:7c:aa:7f
 adt_net_vifscript=/etc/xen/scripts/vif-route-adt

diff --git a/xen/with-testbed b/xen/with-testbed
index 578b7242ede8b123a31e825d61bc45f5d90ce902..f00019506ca2c01d51c90cef386fa427525ead5e 100755 (executable)
--- a/xen/with-testbed
+++ b/xen/with-testbed
@@ -30,6 +30,7 @@ rc=$?
 set -e
 
 xm destroy $adt_xmname
+do_udevsettle
 dmsetup remove $adt_devmapper_cowdev
 
 trap '' 0