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
better support for systems with no pxe
[automated-distro-installer]
/
pxe-server
diff --git
a/pxe-server
b/pxe-server
index d8cbeb819b03bc134245ba0ec484f03577cf3114..6adbf19214286141b7622392f3ceff35226a1f5d 100755
(executable)
--- a/
pxe-server
+++ b/
pxe-server
@@
-28,11
+28,11
@@
trap 'echo "$0:$LINENO:error: \"$BASH_COMMAND\" returned $?" >&2' ERR
usage() {
cat <<EOF
usage() {
cat <<EOF
-Usage: ${0##*/} [OPTIONS]
TYPE [HOST
]
+Usage: ${0##*/} [OPTIONS]
[HOST TYPE
]
One line description
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
+TYPE is one of arch, plain, fai.
+HOST
is a hostname known to the dhcp server, or default for all, or none to disable
-r Don't redeploy fai config.
-a Wait for 2 dhcp acks, then disable the pxe server after a delay.
-r Don't redeploy fai config.
-a Wait for 2 dhcp acks, then disable the pxe server after a delay.
@@
-68,12
+68,16
@@
while true; do
esac
done
esac
done
-read
type host
<<<"$@"
+read
host type
<<<"$@"
-if [[ ! $type ]]; then
- echo "$0: error: exptected 1 argument of type"
- usage 1
-fi
+case $# in
+ 0|2);;
+ *)
+ echo "$0: error: expected 0 or 2 arguments"
+ echo
+ usage 1
+ ;;
+esac
if [[ $host ]]; then
host_tag="tag:$host,"
if [[ $host ]]; then
host_tag="tag:$host,"
@@
-127,19
+131,22
@@
ack-wait() {
}
set-pxe() {
}
set-pxe() {
- ${
1:-$type} | ssh wrt "cedit pxe-server
/etc/dnsmasq.conf || /etc/init.d/dnsmasq restart
-
if [[ $type == arch ]]; then arch-pxe-mount; fi
"
+ ${
type:-:}|ssh wrt "cedit pxe
/etc/dnsmasq.conf || /etc/init.d/dnsmasq restart
+
$([[ $type == arch ]] && echo arch-pxe-mount)
"
}
if $set; then
set-pxe
}
if $set; then
set-pxe
-
if [[ $type == fai ]]; then
if [[ $type == fai ]]; then
+ myfai-chboot $host
if $redep; then
fai-redep
fi
faiserver-enable
if $redep; then
fai-redep
fi
faiserver-enable
+ else
+ myfai-chboot
+ faiserver-disable
fi
fi
fi
fi
@@
-150,7
+157,7
@@
if $wait; then
# bleh.
echo "waiting for $acks dhcp acks then disabling pxe"
ack-wait $acks
# bleh.
echo "waiting for $acks dhcp acks then disabling pxe"
ack-wait $acks
- set-pxe
:
+ set-pxe
# previously tried waiting for one more ack then disabling faiserver,
# since it can contain sensitive info, so turn it off when not in use,
# previously tried waiting for one more ack then disabling faiserver,
# since it can contain sensitive info, so turn it off when not in use,