X-Git-Url: https://iankelling.org/git/?a=blobdiff_plain;f=fai-revm;h=d09bbcc7a986552dccd53dee09a7f8b55dfcc76c;hb=ace13281eb68397600d7c4eb4c2718652f3d2e78;hp=30f541995fc98e2e43ebf83c4f01cbf0af767e86;hpb=ac4e0089e245c96a388b8fcdd92fc05da3399694;p=automated-distro-installer

diff --git a/fai-revm b/fai-revm
index 30f5419..d09bbcc 100755
--- a/fai-revm
+++ b/fai-revm
@@ -100,8 +100,17 @@ else
     e ./pxe-server $dhcp_arg demohost fai
     sleep 2
   else
-    fai-monitor&
-    boot_arg="--cdrom /a/bin/fai-basefiles/autodiscover.iso"
+    killall fai-monitor &>/dev/null ||:
+    fai-monitor &
+    if [[ ! $BASEFILE_DIR ]]; then
+      BASEFILE_DIR=/tmp
+    fi
+    a=$BASEFILE_DIR/autodiscover.iso
+    b=$BASEFILE_DIR/STRETCH64.tar.gz
+    if [[ ! -e $a || $(stat -c %Y $a) -lt $(stat -c %Y $b) ]]; then
+      e s fai-cd -g $(readlink -f grub.cfg.autodiscover) -f -A $BASEFILE_DIR/autodiscover.iso
+    fi
+    boot_arg="--cdrom $BASEFILE_DIR/autodiscover.iso"
     e fai-redep
     e myfai-chboot default
   fi
@@ -158,7 +167,7 @@ while ! timeout -s 9 10 ssh -oBatchMode=yes root@$name /bin/true; do
   e sleep 5
 done
 unset _errcatch_cleanup
-e pxe-server
+e ./pxe-server $dhcp_arg
 if is_arch_revm; then
   ./arch-init-remote $name
 fi