various changes for libreboot having no pxe

[automated-distro-installer] / pxe-server

diff --git a/pxe-server b/pxe-server
index 6b6a5765e2571c2550cc64b53ffbbed24bdba2ea..d8cbeb819b03bc134245ba0ec484f03577cf3114 100755 (executable)
--- a/pxe-server
+++ b/pxe-server
@@ -40,6 +40,7 @@ HOST makes the pxe server only for that specific host
            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
 
 
@@ -54,13 +55,14 @@ args=()
 redep=true
 acks=2
 wait=false
-temp=$(getopt -l help hra "$@") || usage 1
+temp=$(getopt -l help harw "$@") || usage 1
 eval set -- "$temp"
 while true; do
     case $1 in
-        -h|--help) usage ;;
+        -a) wait=true; set=false; shift ;;
         -r) redep=false; shift ;;
-        -a) wait=true; shift ;;
+        -w) wait=true; set=true; shift ;;
+        -h|--help) usage ;;
         --) shift; break ;;
         *) echo "$0: Internal error!" ; exit 1 ;;
     esac
@@ -103,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
 }
 
@@ -129,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