X-Git-Url: https://iankelling.org/git/?a=blobdiff_plain;f=pxe-server;h=6b6a5765e2571c2550cc64b53ffbbed24bdba2ea;hb=bf19e9969f50a637c8fabf724eb9e292da472e01;hp=6099ddba82f9b98a2bfa1d2e065784843f9e2d45;hpb=2e975979fa5bad84f3d2a84a9d62fbfd8793374c;p=automated-distro-installer

diff --git a/pxe-server b/pxe-server
index 6099ddb..6b6a576 100755
--- a/pxe-server
+++ b/pxe-server
@@ -1,4 +1,19 @@
 #!/bin/bash
+# Copyright (C) 2016 Ian Kelling
+
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
 # Setup dhcp server to point to tftp server,
 # and depending on the type, setup the tftp server.
@@ -19,32 +34,39 @@ One line description
 TYPE is one of arch, plain, fai, or : for no pxe server.
 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.
+-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.
+-h|--help  Print help and exit
+
+
+Note: Uses GNU getopt options parsing style
 EOF
     exit $1
 }
 
 ##### begin command line parsing ########
 
-persist=false
 args=()
 redep=true
-while [[ $1 ]]; do
+acks=2
+wait=false
+temp=$(getopt -l help hra "$@") || usage 1
+eval set -- "$temp"
+while true; do
     case $1 in
-        --) shift; break ;;
         -h|--help) usage ;;
         -r) redep=false; shift ;;
-        -p) persist=true; shift ;;
-        *) args+=("$1"); shift ;;
+        -a) wait=true; shift ;;
+        --) shift; break ;;
+        *) echo "$0: Internal error!" ; exit 1 ;;
     esac
 done
-args+=("$@")
 
-
-read type host <<<"${args[@]}"
+read type host <<<"$@"
 
 if [[ ! $type ]]; then
     echo "$0: error: exptected 1 argument of type"
@@ -55,13 +77,9 @@ if [[ $host ]]; then
     host_tag="tag:$host,"
 fi
 
-case $type in
-    :|true) persist=true ;;
-esac
-
 ##### end command line parsing ########
 
-sv() {
+e() {
     echo "$@"
     "$@"
 }
@@ -103,7 +121,7 @@ ack-wait() {
             echo $line
         fi
     done < <(ssh wrt logread -f)
-    sv sleep 5
+    e sleep 20
 }
 
 set-pxe() {
@@ -111,24 +129,34 @@ 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
-    echo "waiting for 2 dhcp acks then disabling pxe"
-    ack-wait 2
+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.
+    # bleh.
+    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