X-Git-Url: https://iankelling.org/git/?a=blobdiff_plain;f=fai-revm;h=5ea9d98ca77ca34b1fdb081f3edcf389881083c7;hb=c820c35e71e31c33de6743f8d225f7c5cd71a70f;hp=97b6338ff1f97e9d64871c39ed9f628c98d6c132;hpb=d6df8985152a6c17523cedc3fee62694544eeaf2;p=automated-distro-installer diff --git a/fai-revm b/fai-revm index 97b6338..5ea9d98 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,7 +77,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 @@ -120,7 +121,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,7 +129,7 @@ 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() { :; }