X-Git-Url: https://iankelling.org/git/?a=blobdiff_plain;f=pxe-server;h=15d52e74cc6a47984e7756765e8b0ac3ebeefe44;hb=708c79e5611549280b988c607e1a1a19fc63e991;hp=b8e2092214931505d5a050a03cb04af61f3e7439;hpb=c4337bdfa287cb3160b294d58c64b51f870117ea;p=automated-distro-installer

diff --git a/pxe-server b/pxe-server
index b8e2092..15d52e7 100755
--- a/pxe-server
+++ b/pxe-server
@@ -28,20 +28,25 @@ trap 'echo "$0:$LINENO:error: \"$BASH_COMMAND\" returned $?" >&2' ERR
 
 usage() {
     cat <<EOF
-Usage: ${0##*/} [OPTIONS] TYPE [HOST]
+Usage: ${0##*/} [OPTIONS] [HOST TYPE]
 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
+Without HOST TYPE, disable pxe server and fai server.
+TYPE is one of arch, plain, fai.
+HOST is a hostname known to the dhcp server, or default for all
 
--h|--help  Print help and exit
---         Subsequent arguments are never treated as options
--r         Don't redeploy fai config.
+-r         Don't redeploy fai config. For example, if there is a different host
+           that is mid-install.
 -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
 }
@@ -52,24 +57,29 @@ args=()
 redep=true
 acks=2
 wait=false
-while [[ $1 ]]; do
+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 ;;
-        -a) wait=true; 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 host type <<<"$@"
 
-if [[ ! $type ]]; then
-    echo "$0: error: exptected 1 argument of type"
-    usage 1
-fi
+case $# in
+    0|2);;
+    *)
+        echo "$0: error: expected 0 or 2 arguments"
+        echo
+        usage 1
+        ;;
+esac
 
 if [[ $host ]]; then
     host_tag="tag:$host,"
@@ -101,7 +111,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,18 +133,20 @@ ack-wait() {
 }
 
 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"
+    ${type:-:}|ssh wrt "cedit pxe /etc/dnsmasq.conf || /etc/init.d/dnsmasq restart
+$([[ $type == arch ]] && echo arch-pxe-mount)"
 }
 
-if ! $wait && [[ $type != : ]]; then
-    set-pxe
 
+if $set; then
+    set-pxe
     if [[ $type == fai ]]; then
+        e myfai-chboot $host
         if $redep; then
-            fai-redep
+            e fai-redep
         fi
-        faiserver-enable
+    else
+        e myfai-chboot
     fi
 fi
 
@@ -145,7 +157,8 @@ if $wait; then
     # bleh.
     echo "waiting for $acks dhcp acks then disabling pxe"
     ack-wait $acks
-    set-pxe :
+    type=
+    set-pxe
 
     # previously tried waiting for one more ack then disabling faiserver,
     # since it can contain sensitive info, so turn it off when not in use,