add arch support, fixup various things

[automated-distro-installer] / fai-revm

diff --git a/fai-revm b/fai-revm
index 3b3e003c7e35ba20c0960c29de98ce4b59aadfe3..97bb1a8abd16e363425e773a07ba75771466f5d3 100755 (executable)
--- a/fai-revm
+++ b/fai-revm
@@ -6,16 +6,28 @@
 set -eE -o pipefail
 trap 'echo "$0:$LINENO:error: \"$BASH_COMMAND\" returned $?"' ERR
 
+new_disk=false
+[[ ! $1 ]] || new_disk=true
+
 cd "${BASH_SOURCE%/*}"
 
-./fai-redep
+[[ $0 == *arch-revm ]] || ./fai-redep
+
+name=demohost
 
-s virshrm demohost ||:
+s virshrm $name ||:
 
-for f in /var/lib/libvirt/images/demohost{,b}; do
-    [[ -e $f ]] || s qemu-img create -o preallocation=metadata -f qcow2 $f 30G
+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 debian8 --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