main fai scripts can run outside of fai, fixup stuff

[automated-distro-installer] / fai-revm

diff --git a/fai-revm b/fai-revm
index f7bf872baa6fb48ea5190ceac85bca9e7bfc3ed8..aa10dfc8eeb18bc9b3f04f9067c4c43ee4736605 100755 (executable)
--- a/fai-revm
+++ b/fai-revm
@@ -8,9 +8,10 @@ set -x
 set -eE -o pipefail
 trap 'echo "$0:$LINENO:error: \"$BASH_COMMAND\" returned $?" >&2' ERR
 
-redeploy=false
+# I had this set false as default before, can't remember why. oh well.
+redeploy=true
 if [[ $1 == -r ]]; then
-    redeploy=true
+    redeploy=false
 fi
 
 disk_count=2
@@ -26,14 +27,21 @@ fi
 
 cd $script_dir
 
+is_arch_revm() {
+    [[ ${0##*/} == arch-revm ]]
+}
 
 new_disk=false
 [[ ! $1 ]] || new_disk=true
 
-if [[ $0 == *arch-revm ]]; then
+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
@@ -57,18 +65,23 @@ done
 
 if [[ $SSH_CLIENT ]]; then
     console_arg=--noautoconsole
-else
-    console_arg='&'
 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
+  --graphics spice,listen=0.0.0.0 $console_arg |& grep -v '^$' | uniq &
+
+if [[ $SSH_CLIENT ]]; then
+    fg
+fi
+
 
-if [[ ${0##*/} == arch-revm ]]; then
-    sleep 80
+if is_arch_revm; then
+    while ! timeout 10 ssh $name /bin/true; do sleep 1; done
     ./arch-init-remote $name
 fi