Merge branch 'upstream'

[automated-distro-installer] / fai-revm

diff --git a/fai-revm b/fai-revm
index 547689d462ae2f550eae0b07b1d839ebb62ab5cf..cc494cccb2c424293cf95ca05383b4c9dd44a3a7 100755 (executable)
--- a/fai-revm
+++ b/fai-revm
@@ -44,11 +44,9 @@ EOF
 }
 
 
-# not sure why I wanted to have this option before. oh well.
-redeploy=true
-
+new_disk=false
 reboot=true
-temp=$(getopt -l opt o "$@") || usage 1
+temp=$(getopt -l help hnr "$@") || usage 1
 eval set -- "$temp"
 while true; do
     case $1 in
@@ -61,10 +59,6 @@ while true; do
 done
 
 
-if [[ $1 == -r ]]; then
-    redeploy=false
-fi
-
 # change this to test different disk counts. 1 and > 1 should be the only
 # important things to test.
 disk_count=1
@@ -85,19 +79,19 @@ is_arch_revm() {
     [[ ${0##*/} == arch-revm ]]
 }
 
-cleanup() { ./pxe-server :; }
+cleanup() { ./pxe-server; }
 if is_arch_revm; then
-    ./pxe-server arch
+    ./pxe-server demohost arch
     sleep 2
     # via osinfo-query os. guessing arch is closest to latest fedora.
     variant=fedora22
 else
-    ./pxe-server fai
+    ./pxe-server demohost fai
     sleep 2
-    if $redeploy; then
-        ./fai-redep
-    fi
-    variant=ubuntu16.04
+    # I don't think these variants actually make a diff for us, but I
+    # use the appropriate one when trying a new distro just in case.
+    variant=ubuntu14.04
+    #variant=ubuntu16.04
     #variant=debian8
 fi
 
@@ -136,9 +130,10 @@ fi
 sleep 30
 while ! timeout -s 9 10 ssh root@$name /bin/true; do
     e sleep 5
+    khfix root@$name ||:
 done
 cleanup() { :; }
-e pxe-server :
+e pxe-server
 if is_arch_revm; then
     ./arch-init-remote $name
 fi