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 3223fb9033d4f461706cccd0e3e06a6d2480bba2..4e4aaa8262f0d80f229fe95aada34d025b15d109 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.
@@
-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.
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
-h|--help Print help and exit
@@
-54,24
+55,29
@@
args=()
redep=true
acks=2
wait=false
redep=true
acks=2
wait=false
-temp=$(getopt -l help h
ra
"$@") || usage 1
+temp=$(getopt -l help h
arw
"$@") || usage 1
eval set -- "$temp"
while true; do
case $1 in
eval set -- "$temp"
while true; do
case $1 in
- -
h|--help) usage
;;
+ -
a) wait=true; set=false; shift
;;
-r) redep=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
done
--) shift; break ;;
*) echo "$0: Internal error!" ; exit 1 ;;
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,"
@@
-103,7
+109,7
@@
EOF
fai() {
cat <<EOF
$set_host_tag
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
}
EOF
}
@@
-125,17
+131,21
@@
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)
"
}
}
-set-pxe
-if [[ $type == fai ]]; then
- if $redep; then
- fai-redep
+if $set; then
+ set-pxe
+ if [[ $type == fai ]]; then
+ myfai-chboot $host
+ if $redep; then
+ fai-redep
+ fi
+ else
+ myfai-chboot
fi
fi
- faiserver-enable
fi
if $wait; then
fi
if $wait; then
@@
-145,7
+155,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,