X-Git-Url: https://iankelling.org/git/?a=blobdiff_plain;f=fai-revm;h=d8833ab4b01e2e920f6f31bc2793a64c56f0b763;hb=bf19e9969f50a637c8fabf724eb9e292da472e01;hp=aa10dfc8eeb18bc9b3f04f9067c4c43ee4736605;hpb=c8bd51084bc4d90b9653d521e7cb05e17e417d97;p=automated-distro-installer

diff --git a/fai-revm b/fai-revm
index aa10dfc..d8833ab 100755
--- a/fai-revm
+++ b/fai-revm
@@ -1,28 +1,80 @@
 #!/bin/bash -l
-set -x
+# Copyright (C) 2016 Ian Kelling
 
-# Assumes pxe config for dhcp has been setup.
-# Deploy fai configuration to faiserver,
-# then start a virtual machine to test the config.
+# 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.
+
+
+
+cleanup() { :; }
 set -eE -o pipefail
-trap 'echo "$0:$LINENO:error: \"$BASH_COMMAND\" returned $?" >&2' ERR
+trap 'cleanup; echo "$0:$LINENO:error: \"$BASH_COMMAND\" returned $?" >&2' ERR
+script_dir=$(dirname $(readlink -f "$BASH_SOURCE"))
+
+e() { echo "$*"; "$@"; }
 
-# I had this set false as default before, can't remember why. oh well.
+
+usage() {
+    cat <<EOF
+# Usage: ${0##*/} [OPTIONS]
+Setup fai or arch pxe (depending on $0 name)
+then start a virtual machine to test the config
+
+Note, sometimes shutting down the existing demohost vm
+fails. Just run again if that happens.
+
+-r         Do not reboot.
+-n         Create new qcow2(s) for vm
+-h|--help  Print help and exit.
+
+Note: Uses GNU getopt options parsing style
+EOF
+    exit $1
+}
+
+
+# not sure why I wanted to have this option before. oh well.
 redeploy=true
+
+reboot=true
+temp=$(getopt -l opt o "$@") || usage 1
+eval set -- "$temp"
+while true; do
+    case $1 in
+        -n) new_disk=true; shift ;;
+        -r) reboot=false; shift ;;
+        -h|--help) usage ;;
+        --) shift; break ;;
+        *) echo "$0: Internal error!" ; exit 1 ;;
+    esac
+done
+
+
 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
+    # Copy our script elsewhere so we can develop it
+    # and save it at the same time it's running
+    rm -rf /tmp/faifreeze
     mkdir -p /a/tmp
-    cp -ar /a/bin/fai /a/tmp/fai2
-    exec /a/tmp/fai2/${BASH_SOURCE##*/} "$@"
+    cp -ar /a/bin/fai /tmp/faifreeze
+    exec /tmp/faifreeze/${BASH_SOURCE##*/} "$@"
 fi
 
 cd $script_dir
@@ -31,16 +83,14 @@ is_arch_revm() {
     [[ ${0##*/} == arch-revm ]]
 }
 
-new_disk=false
-[[ ! $1 ]] || new_disk=true
-
+cleanup() { ./pxe-server :; }
 if is_arch_revm; then
-    ./pxe-server arch &
+    ./pxe-server arch
     sleep 2
     # via osinfo-query os. guessing arch is closest to latest fedora.
     variant=fedora22
 else
-    ./pxe-server fai &
+    ./pxe-server fai
     sleep 2
     if $redeploy; then
         ./fai-redep
@@ -50,7 +100,7 @@ fi
 
 name=demohost
 
-s virshrm $name ||:
+e s virshrm $name ||:
 
 
 disk_arg=()
@@ -59,7 +109,7 @@ for ((i=1; i <= disk_count; i++)); do
     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
+        e s qemu-img create -o preallocation=metadata -f qcow2 $f 20G
     fi
 done
 
@@ -72,16 +122,20 @@ fi
 # 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 \
+e 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 &
+  --graphics spice,listen=0.0.0.0 $console_arg |& grep -v '^ *$' | uniq &
 
 if [[ $SSH_CLIENT ]]; then
     fg
 fi
 
-
+sleep 30
+while ! timeout -s 9 10 ssh root@$name /bin/true; do
+    e sleep 5
+done
+cleanup() { :; }
+e pxe-server :
 if is_arch_revm; then
-    while ! timeout 10 ssh $name /bin/true; do sleep 1; done
     ./arch-init-remote $name
 fi