minor polishings for xenlvm

diff --git a/debian/changelog b/debian/changelog
index 82599527ad8e6b1a46810fccbb98bd2bbca8ae2a..82d165909ad03c0b6456c73836141166f95e7558 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+autopkgtest (0.6.1) unstable; urgency=low
+
+  * autopkgtest-xenlvm: filter output from debootstrap to make
+    the amount of output more reasonable.  set -o pipefail.
+    Create a timestamp file on image creation.  Warn if ipv4
+    forwarding is turned off.
+
+ --
+
 autopkgtest (0.6.0) edgy; urgency=low
 
   * autopkgtest-xenlvm: new package with Xen/LVM management

diff --git a/xen/readconfig.in b/xen/readconfig.in
index 35648094d947b9fea7870c8b5d0b4ef28207e271..19aa750d8999ab9a598d7a678f68d0451e49770c 100644 (file)
--- a/xen/readconfig.in
+++ b/xen/readconfig.in
@@ -2,6 +2,7 @@
 # adt_... variables and some other useful ones.
 
 set -e${ADT_SHELLX}
+set -o pipefail
 
 #---------- useful general functions ----------
 

diff --git a/xen/setup b/xen/setup
index f97f5aff25179a3f6d9977429fd9873f5afbe589..72254498b7a0bcd3e7a3ddb752e34b68a66d9c69 100755 (executable)
--- a/xen/setup
+++ b/xen/setup
@@ -20,12 +20,17 @@ x mkfs -t $adt_fs_type $adt_mkfs_args $lvm_baselv_namepath
 mkdir -p $adt_play/base
 x mount $lvm_baselv_namepath $adt_play/base
 
-x debootstrap \
-       --components="${adt_debootstrap_components}" \
+x debootstrap                                                           \
+       --components="${adt_debootstrap_components}"                     \
        --include=${adt_debootstrap_include},${adt_debootstrap_includemore} \
-       $adt_debootstrap_opts                   \
-       "$adt_distro" "$adt_play/base"          \
-       "$adt_debootstrap_mirrors" "$adt_debootstrap_script"
+       $adt_debootstrap_opts                                           \
+       "$adt_distro" "$adt_play/base"                                  \
+       "$adt_debootstrap_mirrors" "$adt_debootstrap_script"            \
+ |perl -pe '
+ s/^(I: (?:Retrieving|Validating|Extracting|Unpacking|Configuring) [^A-Z].*)\n/
+  sprintf "%-75s\r", $1
+  /e
+'
 
 $ADT_XENLVM_SHARE/fixups "$@"
 
@@ -62,9 +67,23 @@ ln -sf ../$lvm_baselv_namerhs ${lvm_fslink_ptr}
 x xm create $adt_xmconfig name=$adt_xmname
 retries=10
 
+if grep 0 /proc/sys/net/ipv4/ip_forward >/dev/null; then
+       cat <<END
+
+********** WARNING - IP FORWARDING IS TURNED OFF **********
+Your testbed will probably have trouble with downloads, DNS, etc.
+You must turn this on manually, since it is a major config change.
+
+END
+fi
+
 while true; do
        if ping -c 1 $adt_guest_ipaddr && \
-          /usr/share/autopkgtest/xenlvm/on-testbed id; then break; fi
+          /usr/share/autopkgtest/xenlvm/on-testbed '
+               set -e; umask 002; cd /var/lib;
+               mkdir -p autopkgtest; cd autopkgtest;
+               touch xenlvm-created
+       '; then break; fi
        if [ $retries -le 0 ]; then 
                echo >&2 'no response from guest'
                x xm console $adt_xmname