From: Ian Jackson <ian@anarres>
Date: Tue, 3 Apr 2007 17:50:56 +0000 (+0100)
Subject: * Set DEBIAN_FRONTEND=noninteractive.
X-Git-Tag: converted-from-bzr~32^3~11
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=ab2b462f44f2063b62b5cb93957bcfba7959c007;p=autopkgtest.git

* Set DEBIAN_FRONTEND=noninteractive.
* Run udevsettle after xm destroy but before dmsetup remove.
---

diff --git a/debian/changelog b/debian/changelog
index bd212f3..13b75b2 100644
--- 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 76a9a23..de08ded 100755
--- 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 17a692b..ee10c20 100644
--- 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 578b724..f000195 100755
--- 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