better error output

[automated-distro-installer] / fai-revm

diff --git a/fai-revm b/fai-revm
index 3b3e003c7e35ba20c0960c29de98ce4b59aadfe3..f7bf872baa6fb48ea5190ceac85bca9e7bfc3ed8 100755 (executable)
--- a/fai-revm
+++ b/fai-revm
@@ -1,21 +1,74 @@
-#!/bin/bash -lx
+#!/bin/bash -l
+set -x
 
+# Assumes pxe config for dhcp has been setup.
 # Deploy fai configuration to faiserver,
 # then start a virtual machine to test the config.
 
 set -eE -o pipefail
-trap 'echo "$0:$LINENO:error: \"$BASH_COMMAND\" returned $?"' ERR
+trap 'echo "$0:$LINENO:error: \"$BASH_COMMAND\" returned $?" >&2' ERR
 
-cd "${BASH_SOURCE%/*}"
+redeploy=false
+if [[ $1 == -r ]]; then
+    redeploy=true
+fi
 
-./fai-redep
+disk_count=2
 
-s virshrm demohost ||:
+script_dir=$(dirname $(readlink -f "$BASH_SOURCE"))
 
-for f in /var/lib/libvirt/images/demohost{,b}; do
-    [[ -e $f ]] || s qemu-img create -o preallocation=metadata -f qcow2 $f 30G
+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
+
+cd $script_dir
+
+
+new_disk=false
+[[ ! $1 ]] || new_disk=true
+
+if [[ $0 == *arch-revm ]]; then
+    # via osinfo-query os. guessing arch is closest to latest fedora.
+    variant=fedora22
+else
+    if $redeploy; then
+        ./fai-redep
+    fi
+    variant=debian8
+fi
+
+name=demohost
+
+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
+        s rm -f $f
+        s qemu-img create -o preallocation=metadata -f qcow2 $f 20G
+    fi
 done
-# osinfo-query os | gr jessie
-s virt-install --os-variant debian8 --cpu host -n demohost --pxe -r 2048 --vcpus 1 \
-  --disk path=/var/lib/libvirt/images/demohost \
-  --disk path=/var/lib/libvirt/images/demohostb -w bridge=br0,mac=52:54:00:9c:ef:ad
+
+if [[ $SSH_CLIENT ]]; then
+    console_arg=--noautoconsole
+else
+    console_arg='&'
+fi
+
+# --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