fix pxe server leaving background procs

[automated-distro-installer] / pxe-server

diff --git a/pxe-server b/pxe-server
index 1f75adb61ebb3a443ae7a2e4e7029adc3a728991..b8e2092214931505d5a050a03cb04af61f3e7439 100755 (executable)
--- a/pxe-server
+++ b/pxe-server
@@ -36,27 +36,28 @@ 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 dhcp acks then remove.
 -r         Don't redeploy fai config.
--a         Wait for 2 dhcp acks instead of the default 3. Some distros
-           do 2, some do 3.
+-a         Wait for 2 dhcp acks, then disable the pxe server after a delay.
+           First ack is for pxe boot, 2nd ack is for os boot. Sometimes
+           on debian, there is a 3rd one shortly after the 2nd. I can't remember
+           exactly why this caused a problem, but I'm hoping the sleep
+           will take care of it.
 EOF
     exit $1
 }
 
 ##### begin command line parsing ########
 
-persist=false
 args=()
 redep=true
-acks=3
+acks=2
+wait=false
 while [[ $1 ]]; do
     case $1 in
         --) shift; break ;;
         -h|--help) usage ;;
         -r) redep=false; shift ;;
-        -p) persist=true; shift ;;
-        -a) acks=2; shift ;;
+        -a) wait=true; shift ;;
         *) args+=("$1"); shift ;;
     esac
 done
@@ -74,14 +75,9 @@ if [[ $host ]]; then
     host_tag="tag:$host,"
 fi
 
-case $type in
-    :|true) persist=true ;;
-    arch) acks=2 ;;
-esac
-
 ##### end command line parsing ########
 
-sv() {
+e() {
     echo "$@"
     "$@"
 }
@@ -123,7 +119,7 @@ ack-wait() {
             echo $line
         fi
     done < <(ssh wrt logread -f)
-    sv sleep 5
+    e sleep 20
 }
 
 set-pxe() {
@@ -131,16 +127,18 @@ set-pxe() {
 if [[ $type == arch ]]; then arch-pxe-mount; fi"
 }
 
-set-pxe
+if ! $wait && [[ $type != : ]]; then
+    set-pxe
 
-if [[ $type == fai ]]; then
-    if $redep; then
-        fai-redep
+    if [[ $type == fai ]]; then
+        if $redep; then
+            fai-redep
+        fi
+        faiserver-enable
     fi
-    faiserver-enable
 fi
 
-if ! $persist; then
+if $wait; then
     # fai's debian jessie 8.5ish does 2 dhcp requests when booting,
     # roughly 4 seconds apart. Earlier
     # versions did just 1. Now testing on a vm, it does 1.
@@ -148,11 +146,15 @@ if ! $persist; then
     echo "waiting for $acks dhcp acks then disabling pxe"
     ack-wait $acks
     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
+
+    # previously tried waiting for one more ack then disabling faiserver,
+    # since it can contain sensitive info, so turn it off when not in use,
+    # but disabling that for now as it's inconvenient to clean this
+    # up and run it in the background etc.
+
+    # if [[ $type == fai ]]; then
+    #     echo "waiting for 1 dhcp ack then disabling fai server"
+    #     ack-wait 1
+    #     faiserver-disable
+    # fi
 fi