. ${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
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"
-
-#x pbuilder create \
-# --configfile /usr/share/autopkgtest/xenlvm/pbuilderrc \
-# --distribution "$adt_distro" \
-# --no-targz --buildplace $adt_play/base \
-# $adt_pbuilder_args --debootstrapopts --variant=''
+ $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 "$@"
END
fi
+if [ "x$adt_setup_hook" != x ]; then
+ $adt_setup_hook ${adt_play}/base
+fi
+
x umount $lvm_baselv_namepath
mkdir -p ${lvm_fslink_dirpath}
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