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
fixup initial faiserver bootstrap & small bugs
[automated-distro-installer]
/
pxe-server
diff --git
a/pxe-server
b/pxe-server
index eb9622acdb67446209a8bf841f2b923f50c3b75c..1f75adb61ebb3a443ae7a2e4e7029adc3a728991 100755
(executable)
--- a/
pxe-server
+++ b/
pxe-server
@@
-36,8
+36,10
@@
HOST makes the pxe server only for that specific host
-h|--help Print help and exit
-- Subsequent arguments are never treated as options
-h|--help Print help and exit
-- Subsequent arguments are never treated as options
--p Persist. Otherwise, wait for
2
dhcp acks then remove.
+-p Persist. Otherwise, wait for dhcp acks then remove.
-r Don't redeploy fai config.
-r Don't redeploy fai config.
+-a Wait for 2 dhcp acks instead of the default 3. Some distros
+ do 2, some do 3.
EOF
exit $1
}
EOF
exit $1
}
@@
-47,12
+49,14
@@
EOF
persist=false
args=()
redep=true
persist=false
args=()
redep=true
+acks=3
while [[ $1 ]]; do
case $1 in
--) shift; break ;;
-h|--help) usage ;;
-r) redep=false; shift ;;
-p) persist=true; shift ;;
while [[ $1 ]]; do
case $1 in
--) shift; break ;;
-h|--help) usage ;;
-r) redep=false; shift ;;
-p) persist=true; shift ;;
+ -a) acks=2; shift ;;
*) args+=("$1"); shift ;;
esac
done
*) args+=("$1"); shift ;;
esac
done
@@
-72,6
+76,7
@@
fi
case $type in
:|true) persist=true ;;
case $type in
:|true) persist=true ;;
+ arch) acks=2 ;;
esac
##### end command line parsing ########
esac
##### end command line parsing ########
@@
-138,9
+143,10
@@
fi
if ! $persist; then
# fai's debian jessie 8.5ish does 2 dhcp requests when booting,
# roughly 4 seconds apart. Earlier
if ! $persist; then
# fai's debian jessie 8.5ish does 2 dhcp requests when booting,
# roughly 4 seconds apart. Earlier
- # versions did just 1. Whatever.
- echo "waiting for 3 dhcp acks then disabling pxe"
- ack-wait 3
+ # versions did just 1. Now testing on a vm, it does 1.
+ # bleh.
+ echo "waiting for $acks dhcp acks then disabling pxe"
+ ack-wait $acks
set-pxe :
if [[ $type == fai ]]; then
# fai server can contain sensitive info, so turn it off
set-pxe :
if [[ $type == fai ]]; then
# fai server can contain sensitive info, so turn it off