X-Git-Url: https://iankelling.org/git/?a=blobdiff_plain;f=fai-revm;h=3b1b514a3b662eaf0eb0e37a12171f0ef8dfe9c1;hb=593c7e9993e4f2110846f869f468c4247a349700;hp=9c8fd9c89f528cd7cc0040c72ae17dc1099faa56;hpb=a43d3eec943c5f0491b300214a3c744d31a6e542;p=automated-distro-installer

diff --git a/fai-revm b/fai-revm
index 9c8fd9c..3b1b514 100755
--- a/fai-revm
+++ b/fai-revm
@@ -8,11 +8,23 @@ set -x
 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 -ar /a/bin/fai /a/tmp/fai2
+    exec /a/tmp/fai2/${BASH_SOURCE##*/} "$@"
+fi
+
+cd $script_dir
+
+
 new_disk=false
 [[ ! $1 ]] || new_disk=true
 
-cd $(dirname $(readlink -f "$BASH_SOURCE"))
-
 if [[ $0 == *arch-revm ]]; then
     # via osinfo-query os. guessing arch is closest to latest fedora.
     variant=fedora22
@@ -25,13 +37,16 @@ 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 $variant --cpu host -n $name --pxe -r 2048 --vcpus 1 \
   ${disk_arg[*]} -w bridge=br0,mac=52:54:00:9c:ef:ad &