various minor fixes and improvements

[automated-distro-installer] / fai-revm

diff --git a/fai-revm b/fai-revm
index 880a91c5e0d10a3bcd6ffb8c96df36f5a9624fa8..d09bbcc7a986552dccd53dee09a7f8b55dfcc76c 100755 (executable)
--- a/fai-revm
+++ b/fai-revm
@@ -100,12 +100,15 @@ else
     e ./pxe-server $dhcp_arg demohost fai
     sleep 2
   else
+    killall fai-monitor &>/dev/null ||:
     fai-monitor &
     if [[ ! $BASEFILE_DIR ]]; then
       BASEFILE_DIR=/tmp
     fi
-    if [[ ! -e $BASEFILE_DIR/autodiscover.iso ]]; then
-      fai-cd -g $(readlink -f grub.cfg.autodiscover) -f -A $BASEFILE_DIR/autodiscover.iso
+    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