X-Git-Url: https://iankelling.org/git/?a=blobdiff_plain;f=fai-revm;h=b3e2dec00e9de641d0bd9b676ef265e3f6fff930;hb=1a5548031efc4a1fa88ca94237eac3033cf97ef1;hp=3b3e003c7e35ba20c0960c29de98ce4b59aadfe3;hpb=eae06d9028e4e70a211afef4a73b971067203da1;p=automated-distro-installer

diff --git a/fai-revm b/fai-revm
index 3b3e003..b3e2dec 100755
--- a/fai-revm
+++ b/fai-revm
@@ -1,21 +1,104 @@
-#!/bin/bash -lx
+#!/bin/bash -l
+# Copyright (C) 2016 Ian Kelling
+
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+set -x
+
+# Note, sometimes shutting down the existing demohost vm
+# fails. Just run again if that happens.
 
 # 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
+trap 'echo "$0:$LINENO:error: \"$BASH_COMMAND\" returned $?" >&2' ERR
+
+# I had this set false as default before, can't remember why. oh well.
+redeploy=true
+if [[ $1 == -r ]]; then
+    redeploy=false
+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
 
-cd "${BASH_SOURCE%/*}"
+is_arch_revm() {
+    [[ ${0##*/} == arch-revm ]]
+}
 
-./fai-redep
+new_disk=false
+[[ ! $1 ]] || new_disk=true
 
-s virshrm demohost ||:
+if is_arch_revm; then
+    ./pxe-server arch &
+    sleep 2
+    # via osinfo-query os. guessing arch is closest to latest fedora.
+    variant=fedora22
+else
+    ./pxe-server fai &
+    sleep 2
+    if $redeploy; then
+        ./fai-redep
+    fi
+    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 ||:
+
+
+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 rm -f $f
+        s qemu-img create -o preallocation=metadata -f qcow2 $f 20G
+    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
+
+if [[ $SSH_CLIENT ]]; then
+    console_arg=--noautoconsole
+fi
+
+# --cpu host: this causes mkfs.btrfs to fail with a stack trace which began
+# something like:
+# init_module+0x108/0x1000 [raid6_pq]
+#
+# uniq is to stop gtk-warning spam
+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 |& grep -v '^$' | uniq &
+
+if [[ $SSH_CLIENT ]]; then
+    fg
+fi
+
+
+if is_arch_revm; then
+    while ! timeout -s 9 10 ssh root@$name /bin/true; do sleep 1; done
+    ./arch-init-remote $name
+fi