arch use by-id and various fixes

[automated-distro-installer] / fai-revm

diff --git a/fai-revm b/fai-revm
index 9c8fd9c89f528cd7cc0040c72ae17dc1099faa56..87cf1cf90a01d1486be19c3d147b5738673a05e6 100755 (executable)
--- a/fai-revm
+++ b/fai-revm
@@ -8,16 +8,35 @@ set -x
 set -eE -o pipefail
 trap 'echo "$0:$LINENO:error: \"$BASH_COMMAND\" returned $?"' ERR
 
+redeploy=false
+if [[ $1 == -r ]]; then
+    redeploy=true
+fi
+
+disk_count=2
+
+script_dir=$(dirname $(readlink -f "$BASH_SOURCE"))
+
+if [[ $script_dir == /a/bin/* ]]; then
+    rm -rf /a/tmp/fai2
+    mkdir -p /a/tmp
+    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
 else
-    ./fai-redep
+    if $redeploy; then
+        ./fai-redep
+    fi
     variant=debian8
 fi
 
@@ -25,17 +44,31 @@ 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
+        s 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 &
+if [[ $SSH_CLIENT ]]; then
+    console_arg=--noautoconsole
+else
+    console_arg='&'
+fi
 
-if [[ $0 == *arch-revm ]]; then
+# --cpu host: this causes mkfs.btrfs to fail with a stack trace which began
+# something like:
+# init_module+0x108/0x1000 [raid6_pq]
+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
+
+if [[ ${0##*/} == arch-revm ]]; then
     sleep 80
     ./arch-init-remote $name
 fi