various fixes, make settable basefile dir

[automated-distro-installer] / fai-revm

diff --git a/fai-revm b/fai-revm
index 30f541995fc98e2e43ebf83c4f01cbf0af767e86..79333773f6bf63a4d6437bc210e8b0e5123ebf6c 100755 (executable)
--- a/fai-revm
+++ b/fai-revm
@@ -101,7 +101,13 @@ else
     sleep 2
   else
     fai-monitor&
-    boot_arg="--cdrom /a/bin/fai-basefiles/autodiscover.iso"
+    if [[ $BASEFILE_DIR ]]; then
+      BASEFILE_DIR=/tmp
+    fi
+    if [[ ! -e $BASEFILE_DIR/autodiscover.iso ]]; then
+      fai-cd 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 +164,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