bug fixes for jessie & stretch

[automated-distro-installer] / pxe-server

diff --git a/pxe-server b/pxe-server
index 574a896f05ea3e19bb73590655f5b8e816772252..5507e5d1196ba6b219916f2774be16b3d4759dd1 100755 (executable)
--- a/pxe-server
+++ b/pxe-server
@@ -22,6 +22,7 @@ HOST makes the pxe server only for that specific host
 -h|--help  Print help and exit
 --         Subsequent arguments are never treated as options
 -p         Persist. Otherwise, wait for 2 dhcp acks then remove.
+-r         Don't redeploy fai config.
 EOF
     exit $1
 }
@@ -30,12 +31,12 @@ EOF
 
 persist=false
 args=()
-redep=false
+redep=true
 while [[ $1 ]]; do
     case $1 in
         --) shift; break ;;
         -h|--help) usage ;;
-        -r) redep=true; shift ;;
+        -r) redep=false; shift ;;
         -p) persist=true; shift ;;
         *) args+=("$1"); shift ;;
     esac
@@ -88,28 +89,49 @@ dhcp-boot=${host_tag}fai/pxelinux.0,faiserver.lan,faiserver.lan
 EOF
 }
 
-echo "setting config type: $type"
-$type | ssh wrt "cedit pxe-server /etc/dnsmasq.conf || /etc/init.d/dnsmasq restart #
-if [[ $type == arch ]]; then arch-pxe-mount; fi"
-
-
-if $redep && [[ $type == fai ]]; then
-    fai-redep
-fi
-if ! $persist; then
-    echo "waiting for 2 dhcp acks then disabling pxe"
+ack-wait() {
+    wait_count=$1
     if [[ $host ]]; then
         host_regex=" $host"
     fi
     regex=".*DHCPACK.*$host_regex$"
     i=0
     tmp=$(mktemp)
-    while (( i != 2 )) && read line; do
+    while (( i != wait_count )) && read line; do
         if [[ $line =~ $regex ]]; then
             i=$((i+1))
             echo $line
         fi
     done < <(ssh wrt logread -f)
     sv sleep 5
-    sv "$BASH_SOURCE" :
+}
+
+set-pxe() {
+    ${1:-$type} | ssh wrt "cedit pxe-server /etc/dnsmasq.conf || /etc/init.d/dnsmasq restart
+if [[ $type == arch ]]; then arch-pxe-mount; fi"
+}
+
+set-pxe
+
+if [[ $type == fai ]]; then
+    if $redep; then
+        fai-redep
+    fi
+    faiserver-enable
+fi
+
+if ! $persist; then
+    # fai's debian jessie 8.5ish does 2 dhcp requests when booting,
+    # roughly 4 seconds apart. Earlier
+    # versions did just 1. Whatever.
+    echo "waiting for 3 dhcp acks then disabling pxe"
+    ack-wait 3
+    set-pxe :
+    if [[ $type == fai ]]; then
+        # fai server can contain sensitive info, so turn it off
+        # when it's not in use.
+        echo "waiting for 1 dhcp ack then disabling fai server"
+        ack-wait 1
+        faiserver-disable
+    fi
 fi