X-Git-Url: https://iankelling.org/git/?p=automated-distro-installer;a=blobdiff_plain;f=fai-revm;h=6271a36bfa4980f3be53fa0ca4dd1efe977d4141;hp=2361ecf662848c825205e65149be54ad96600467;hb=c4337bdfa287cb3160b294d58c64b51f870117ea;hpb=23bf2f3666becf9d3c219af1eaea08b4cf843492

diff --git a/fai-revm b/fai-revm
index 2361ecf..6271a36 100755
--- a/fai-revm
+++ b/fai-revm
@@ -22,8 +22,12 @@ set -x
 # Deploy fai configuration to faiserver,
 # then start a virtual machine to test the config.
 
+cleanup() { :; }
 set -eE -o pipefail
-trap 'echo "$0:$LINENO:error: \"$BASH_COMMAND\" returned $?" >&2' ERR
+trap 'cleanup; echo "$0:$LINENO:error: \"$BASH_COMMAND\" returned $?" >&2' ERR
+script_dir=$(dirname $(readlink -f "$BASH_SOURCE"))
+
+e() { echo "$*"; "$@"; }
 
 # I had this set false as default before, can't remember why. oh well.
 redeploy=true
@@ -33,7 +37,6 @@ fi
 
 disk_count=2
 
-script_dir=$(dirname $(readlink -f "$BASH_SOURCE"))
 
 if [[ $script_dir == /a/bin/* ]]; then
     # Copy our script elsewhere so we can develop it
@@ -53,13 +56,14 @@ is_arch_revm() {
 new_disk=false
 [[ ! $1 ]] || new_disk=true
 
+cleanup() { ./pxe-server :; }
 if is_arch_revm; then
-    ./pxe-server arch &
+    ./pxe-server arch
     sleep 2
     # via osinfo-query os. guessing arch is closest to latest fedora.
     variant=fedora22
 else
-    ./pxe-server -a fai &
+    ./pxe-server fai
     sleep 2
     if $redeploy; then
         ./fai-redep
@@ -69,7 +73,7 @@ fi
 
 name=demohost
 
-s virshrm $name ||:
+e s virshrm $name ||:
 
 
 disk_arg=()
@@ -78,7 +82,7 @@ for ((i=1; i <= disk_count; i++)); do
     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
+        e s qemu-img create -o preallocation=metadata -f qcow2 $f 20G
     fi
 done
 
@@ -91,7 +95,7 @@ fi
 # init_module+0x108/0x1000 [raid6_pq]
 #
 # uniq is to stop gtk-warning spam
-s virt-install --os-variant $variant  -n $name --pxe -r 2048 --vcpus 1 \
+e 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 |& grep -v '^ *$' | uniq &
 
@@ -99,8 +103,10 @@ if [[ $SSH_CLIENT ]]; then
     fg
 fi
 
-
+sleep 30
+while ! timeout -s 9 10 ssh root@$name /bin/true; do sleep 5; done
+cleanup() { :; }
+pxe-server :
 if is_arch_revm; then
-    while ! timeout -s 9 10 ssh root@$name /bin/true; do sleep 1; done
     ./arch-init-remote $name
 fi