small fixes

[automated-distro-installer] / fai-revm

diff --git a/fai-revm b/fai-revm
index 3b3e003c7e35ba20c0960c29de98ce4b59aadfe3..9c8fd9c89f528cd7cc0040c72ae17dc1099faa56 100755 (executable)
--- a/fai-revm
+++ b/fai-revm
@@ -1,21 +1,41 @@
-#!/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
 
-cd "${BASH_SOURCE%/*}"
+new_disk=false
+[[ ! $1 ]] || new_disk=true
 
-./fai-redep
+cd $(dirname $(readlink -f "$BASH_SOURCE"))
 
-s virshrm demohost ||:
+if [[ $0 == *arch-revm ]]; then
+    # via osinfo-query os. guessing arch is closest to latest fedora.
+    variant=fedora22
+else
+    ./fai-redep
+    variant=debian8
+fi
 
-for f in /var/lib/libvirt/images/demohost{,b}; do
-    [[ -e $f ]] || s qemu-img create -o preallocation=metadata -f qcow2 $f 30G
+name=demohost
+
+s virshrm $name ||:
+
+for f in /var/lib/libvirt/images/${name}{,b}; do
+    if $new_disk || [[ ! -e $f ]]; then
+        s qemu-img create -o preallocation=metadata -f qcow2 $f 30G
+    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
+
+disk_arg=("--disk path=/var/lib/libvirt/images/$name"{,b})
+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 [[ $0 == *arch-revm ]]; then
+    sleep 80
+    ./arch-init-remote $name
+fi