X-Git-Url: https://iankelling.org/git/?a=blobdiff_plain;f=fai-revm;h=8d782c0f857f6fbc48bf0231d2046de632e9e660;hb=875cea0c266c7802b336f5a8b61b63e109e670fb;hp=fcb9c073a58e0c74ba2702f490f0d82f4a53670e;hpb=d0b6a8cd4608fdffcf733f9180744819d8889be0;p=automated-distro-installer

diff --git a/fai-revm b/fai-revm
index fcb9c07..8d782c0 100755
--- a/fai-revm
+++ b/fai-revm
@@ -34,7 +34,7 @@ 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.
+-r         Do not boot after install is complete
 -n         Create new qcow2(s) for vm
 -h|--help  Print help and exit.
 
@@ -43,15 +43,13 @@ EOF
     exit $1
 }
 
-
 new_disk=false
-reboot=true
 temp=$(getopt -l help hnr "$@") || usage 1
 eval set -- "$temp"
 while true; do
     case $1 in
         -n) new_disk=true; shift ;;
-        -r) reboot=false; shift ;;
+        -r) reboot_arg=--noreboot; shift ;;
         -h|--help) usage ;;
         --) shift; break ;;
         *) echo "$0: Internal error!" ; exit 1 ;;
@@ -79,14 +77,14 @@ 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
     # 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.
@@ -120,7 +118,7 @@ fi
 #
 # uniq is to stop gtk-warning spam
 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 \
+  ${disk_arg[*]} -w bridge=br0,mac=52:54:00:9c:ef:ad $reboot_arg \
   --graphics spice,listen=0.0.0.0 $console_arg |& grep -v '^ *$' | uniq &
 
 if [[ $SSH_CLIENT ]]; then
@@ -128,11 +126,11 @@ 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
 done
 cleanup() { :; }
-e pxe-server :
+e pxe-server
 if is_arch_revm; then
     ./arch-init-remote $name
 fi