set -eE -o pipefail
trap 'echo "$0:$LINENO:error: \"$BASH_COMMAND\" returned $?"' ERR
+redeploy=false
+if [[ $1 == -r ]]; then
+ redeploy=true
+fi
disk_count=2
if [[ $script_dir == /a/bin/* ]]; then
rm -rf /a/tmp/fai2
+ mkdir -p /a/tmp
cp -ar /a/bin/fai /a/tmp/fai2
exec /a/tmp/fai2/${BASH_SOURCE##*/} "$@"
fi
# via osinfo-query os. guessing arch is closest to latest fedora.
variant=fedora22
else
- ./fai-redep
+ if $redeploy; then
+ ./fai-redep
+ fi
variant=debian8
fi
s virshrm $name ||:
+
disk_arg=()
for ((i=1; i <= disk_count; i++)); do
f=/var/lib/libvirt/images/${name}$i
disk_arg+=("--disk path=$f")
if $new_disk || [[ ! -e $f ]]; then
- rm -f $f
+ s rm -f $f
s qemu-img create -o preallocation=metadata -f qcow2 $f 20G
fi
done
-s virt-install --os-variant $variant --cpu host -n $name --pxe -r 2048 --vcpus 1 \
- ${disk_arg[*]} -w bridge=br0,mac=52:54:00:9c:ef:ad &
+if [[ $SSH_CLIENT ]]; then
+ console_arg=--noautoconsole
+else
+ console_arg='&'
+fi
-if [[ $0 == *arch-revm ]]; then
+# --cpu host: this causes mkfs.btrfs to fail with a stack trace which began
+# something like:
+# init_module+0x108/0x1000 [raid6_pq]
+s virt-install --os-variant $variant -n $name --pxe -r 2048 --vcpus 1 \
+ ${disk_arg[*]} -w bridge=br0,mac=52:54:00:9c:ef:ad \
+ --graphics spice,listen=0.0.0.0 $console_arg
+
+if [[ ${0##*/} == arch-revm ]]; then
sleep 80
./arch-init-remote $name
fi