get adtxenu username right; suppress debug properly when !--debug

[autopkgtest.git] / xen / setup

diff --git a/xen/setup b/xen/setup
index f97f5aff25179a3f6d9977429fd9873f5afbe589..d617a88f04fd628bb9c0118cf4947b0485e8abe3 100755 (executable)
--- a/xen/setup
+++ b/xen/setup
@@ -3,11 +3,7 @@ set -e
 . ${ADT_XENLVM_SHARE:=/usr/share/autopkgtest/xenlvm}/readconfig
 test $nonoptargs = 0 || fail "non-option arguments not allowed"
 
-$ADT_XENLVM_SHARE/cleanup
-x lvchange -a n $lvm_baselv_namepath ||:
-x lvchange -a n $lvm_cowdata_namepath ||:
-x lvremove $lvm_baselv_namepath ||:
-x lvremove $lvm_cowdata_namepath ||:
+$ADT_XENLVM_SHARE/purge
 
 x lvcreate -L $adt_fs_size -n $adt_lvm_baselv $adt_lvm_vg
 x lvcreate -L $adt_fs_snapsize -n $adt_lvm_cowdatalv $adt_lvm_vg
@@ -20,12 +16,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 +63,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