X-Git-Url: https://iankelling.org/git/?a=blobdiff_plain;f=fai-revm;h=79b54a2e303f7acc9d42dee10c0e899ae1664a8f;hb=3c98a1230f8c0177d194038ac9c4db70648af792;hp=97bb1a8abd16e363425e773a07ba75771466f5d3;hpb=a4bf1d090bfbb5603bd6f2aa9f67a2e8a702d476;p=automated-distro-installer

diff --git a/fai-revm b/fai-revm
index 97bb1a8..79b54a2 100755
--- a/fai-revm
+++ b/fai-revm
@@ -1,30 +1,55 @@
-#!/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
 
+
+disk_count=2
+
+script_dir=$(dirname $(readlink -f "$BASH_SOURCE"))
+
+if [[ $script_dir == /a/bin/* ]]; then
+    rm -rf /a/tmp/fai2
+    cp -r /a/bin/fai /a/tmp/fai2
+    exec /a/tmp/fai2/fai-revm "$@"
+fi
+
+cd $(dirname $(readlink -f "$BASH_SOURCE"))
+
+
 new_disk=false
 [[ ! $1 ]] || new_disk=true
 
-cd "${BASH_SOURCE%/*}"
+cd $(dirname $(readlink -f "$BASH_SOURCE"))
 
-[[ $0 == *arch-revm ]] || ./fai-redep
+if [[ $0 == *arch-revm ]]; then
+    # via osinfo-query os. guessing arch is closest to latest fedora.
+    variant=fedora22
+else
+    ./fai-redep
+    variant=debian8
+fi
 
 name=demohost
 
 s virshrm $name ||:
 
-for f in /var/lib/libvirt/images/${name}{,b}; do
+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 qemu-img create -o preallocation=metadata -f qcow2 $f 30G
+        rm -f $f
+        s qemu-img create -o preallocation=metadata -f qcow2 $f 20G
     fi
 done
 
-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 \
+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