X-Git-Url: https://iankelling.org/git/?a=blobdiff_plain;f=pxe-server;h=b1700beab398c08cdc9b1a9b60b99112209b0008;hb=05e47f6734e5a9354a3243686ae55fe4ab2b72c7;hp=7fced849def066ca634f42b3ab20f27708c9bc94;hpb=a2b8051e808621b9a33617d0c75d212bd2141ddc;p=automated-distro-installer

diff --git a/pxe-server b/pxe-server
index 7fced84..b1700be 100755
--- a/pxe-server
+++ b/pxe-server
@@ -64,7 +64,7 @@ dhcp=true
 redep=true
 acks=2
 wait=false
-temp=$(getopt -l help harSw "$@") || usage 1
+temp=$(getopt -l help adrSwh "$@") || usage 1
 eval set -- "$temp"
 while true; do
     case $1 in
@@ -90,6 +90,12 @@ case $# in
         ;;
 esac
 
+if $wait && ! $dhcp; then
+    echo "$0: error -w conflicts with -d, choose one or other"
+    exit 1
+fi
+
+
 if [[ $host && $host != default ]]; then
     host_tag="tag:$host,"
 fi