X-Git-Url: https://iankelling.org/git/?p=automated-distro-installer;a=blobdiff_plain;f=fai-revm;h=68840bd9d962c1c3cac9570464796f8a4f64dc3a;hp=6f8beeb6c326f521872634fce90e3ecaa072745a;hb=efcfb463ceda4de1d9953da31a2c0737471e5cf8;hpb=7386cdbee20dd73095264e2ad0ead433f97ac946

diff --git a/fai-revm b/fai-revm
index 6f8beeb..68840bd 100755
--- a/fai-revm
+++ b/fai-revm
@@ -35,7 +35,8 @@ Note, sometimes shutting down the existing demohost vm
 fails. Just run again if that happens.
 
 -r         Do not boot after install is complete
--n         Create new qcow2(s) for vm
+-n         Create new qcow2(s) for vm. Good for testing partitioning
+           script, to ensure a blank disk.
 -h|--help  Print help and exit.
 
 Note: Uses GNU getopt options parsing style
@@ -43,7 +44,6 @@ EOF
     exit $1
 }
 
-
 new_disk=false
 temp=$(getopt -l help hnr "$@") || usage 1
 eval set -- "$temp"
@@ -78,7 +78,10 @@ is_arch_revm() {
     [[ ${0##*/} == arch-revm ]]
 }
 
-cleanup() { ./pxe-server; }
+cleanup() {
+    ./pxe-server
+    ./faiserver-disable
+}
 if is_arch_revm; then
     ./pxe-server demohost arch
     sleep 2
@@ -127,9 +130,8 @@ if [[ $SSH_CLIENT ]]; then
 fi
 
 sleep 30
-while ! timeout -s 9 10 ssh root@$name /bin/true; do
+while ! timeout -s 9 10 ssh -oBatchMode=yes root@$name /bin/true; do
     e sleep 5
-    khfix root@$name ||:
 done
 cleanup() { :; }
 e pxe-server