X-Git-Url: https://iankelling.org/git/?a=blobdiff_plain;f=pxe-server;h=d8cbeb819b03bc134245ba0ec484f03577cf3114;hb=ec9227898fa68bd89de454c87bce8ea051a8d783;hp=1f75adb61ebb3a443ae7a2e4e7029adc3a728991;hpb=23bf2f3666becf9d3c219af1eaea08b4cf843492;p=automated-distro-installer

diff --git a/pxe-server b/pxe-server
index 1f75adb..d8cbeb8 100755
--- a/pxe-server
+++ b/pxe-server
@@ -34,36 +34,41 @@ 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 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.
+-w         Initially setup pxe, then wait like -a.
+-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
-acks=3
-while [[ $1 ]]; do
+acks=2
+wait=false
+temp=$(getopt -l help harw "$@") || usage 1
+eval set -- "$temp"
+while true; do
     case $1 in
-        --) shift; break ;;
-        -h|--help) usage ;;
+        -a) wait=true; set=false; shift ;;
         -r) redep=false; shift ;;
-        -p) persist=true; shift ;;
-        -a) acks=2; shift ;;
-        *) args+=("$1"); shift ;;
+        -w) wait=true; set=true; shift ;;
+        -h|--help) usage ;;
+        --) 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"
@@ -74,14 +79,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 "$@"
     "$@"
 }
@@ -105,7 +105,7 @@ EOF
 fai() {
     cat <<EOF
 $set_host_tag
-dhcp-boot=${host_tag}fai/pxelinux.0,faiserver.lan,faiserver.lan
+dhcp-boot=${host_tag}pxelinux.0,faiserver.lan,faiserver.lan
 EOF
 }
 
@@ -123,7 +123,7 @@ ack-wait() {
             echo $line
         fi
     done < <(ssh wrt logread -f)
-    sv sleep 5
+    e sleep 20
 }
 
 set-pxe() {
@@ -131,16 +131,19 @@ set-pxe() {
 if [[ $type == arch ]]; then arch-pxe-mount; fi"
 }
 
-set-pxe
 
-if [[ $type == fai ]]; then
-    if $redep; then
-        fai-redep
+if $set; then
+    set-pxe
+
+    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 +151,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