iankelling.org
/
git
/
automated-distro-installer
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
various fixes
[automated-distro-installer]
/
pxe-server
diff --git
a/pxe-server
b/pxe-server
index 7fced849def066ca634f42b3ab20f27708c9bc94..b1700beab398c08cdc9b1a9b60b99112209b0008 100755
(executable)
--- a/
pxe-server
+++ b/
pxe-server
@@
-64,7
+64,7
@@
dhcp=true
redep=true
acks=2
wait=false
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
eval set -- "$temp"
while true; do
case $1 in
@@
-90,6
+90,12
@@
case $# in
;;
esac
;;
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
if [[ $host && $host != default ]]; then
host_tag="tag:$host,"
fi