various changes for libreboot having no pxe

[automated-distro-installer] / pxe-server

diff --git a/pxe-server b/pxe-server
index b8e2092214931505d5a050a03cb04af61f3e7439..d8cbeb819b03bc134245ba0ec484f03577cf3114 100755 (executable)
--- a/pxe-server
+++ b/pxe-server
@@ -34,14 +34,17 @@ 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
 -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.
+-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,19 +55,20 @@ 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 type host <<<"$@"
 
 if [[ ! $type ]]; then
     echo "$0: error: exptected 1 argument of type"
@@ -101,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
 }
 
@@ -127,7 +131,8 @@ set-pxe() {
 if [[ $type == arch ]]; then arch-pxe-mount; fi"
 }
 
-if ! $wait && [[ $type != : ]]; then
+
+if $set; then
     set-pxe
 
     if [[ $type == fai ]]; then