X-Git-Url: https://iankelling.org/git/?a=blobdiff_plain;f=fai-revm;h=cc494cccb2c424293cf95ca05383b4c9dd44a3a7;hb=cf778f7a65037a2a54e2b6008511f0a584326ce9;hp=fcb9c073a58e0c74ba2702f490f0d82f4a53670e;hpb=d0b6a8cd4608fdffcf733f9180744819d8889be0;p=automated-distro-installer diff --git a/fai-revm b/fai-revm index fcb9c07..cc494cc 100755 --- a/fai-revm +++ b/fai-revm @@ -79,14 +79,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. @@ -130,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