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
merge upstream, untested
[automated-distro-installer]
/
pxe-server
diff --git
a/pxe-server
b/pxe-server
index c19f6d2eeadbe95449003b5f12543266aa4739c1..a59e71c5d48676fd61a6cfc78954f01c8de623fe 100755
(executable)
--- a/
pxe-server
+++ b/
pxe-server
@@
-15,12
+15,6
@@
# along with this program; if not, write to the Free Software
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
# along with this program; if not, write to the Free Software
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-# Setup dhcp server to point to tftp server,
-# and depending on the type, setup the tftp server.
-
-# usage: $0 TYPE
-# default distro is the base debian/fedora type. others are fai & arch.
-# for no pxe server, use a no-op like : or true.
x="$(readlink -f "$BASH_SOURCE")"; source "${x%/*}/bash-trace"
x="$(readlink -f "$BASH_SOURCE")"; source "${x%/*}/bash-trace"
@@
-29,14
+23,15
@@
x="$(readlink -f "$BASH_SOURCE")"; source "${x%/*}/bash-trace"
usage() {
cat <<EOF
Usage: ${0##*/} [OPTIONS] [HOST TYPE]
usage() {
cat <<EOF
Usage: ${0##*/} [OPTIONS] [HOST TYPE]
-Configure dnsmasq
pxe server
options and fai-chboot if appropriate.
+Configure dnsmasq
boot
options and fai-chboot if appropriate.
-Without HOST TYPE, disable
pxe
server and fai server.
+Without HOST TYPE, disable server and fai server.
HOST A hostname known to the dhcp server, or default for all.
TYPE One of arch, plain, fai.
HOST A hostname known to the dhcp server, or default for all.
TYPE One of arch, plain, fai.
-
+-d Don't alter dhcp config. Only make sense for fai type, and on network
+ other than home network.
-r Don't redeploy fai config. For example, if there is a different host
that is mid-install.
-r Don't redeploy fai config. For example, if there is a different host
that is mid-install.
@@
-46,6
+41,7
@@
TYPE One of arch, plain, fai.
after the 2nd. I can't remember exactly why this caused a
problem, but I'm hoping the sleep will take care of it.
-S sets FAI_ACTION=sysinfo, see myfai-chboot for more info.
after the 2nd. I can't remember exactly why this caused a
problem, but I'm hoping the sleep will take care of it.
-S sets FAI_ACTION=sysinfo, see myfai-chboot for more info.
+-k Pass -k to myfai-chboot.
-w Setup pxe, then wait like -a.
-h|--help Print help and exit
-w Setup pxe, then wait like -a.
-h|--help Print help and exit
@@
-65,16
+61,20
@@
EOF
##### begin command line parsing ########
##### begin command line parsing ########
+dhcp=true
redep=true
acks=2
wait=false
redep=true
acks=2
wait=false
-temp=$(getopt -l help harSw "$@") || usage 1
+chboot_args=()
+temp=$(getopt -l help adrSkwh "$@") || usage 1
eval set -- "$temp"
while true; do
case $1 in
-a) wait=true; set=false; shift ;;
eval set -- "$temp"
while true; do
case $1 in
-a) wait=true; set=false; shift ;;
+ -d) dhcp=false; shift ;;
-r) redep=false; shift ;;
-r) redep=false; shift ;;
- -S) chboot_arg=-S; shift ;;
+ -S) chboot_args+=(-S); shift ;;
+ -k) chboot_args+=(-k); shift ;;
-w) wait=true; set=true; shift ;;
-h|--help) usage ;;
--) shift; break ;;
-w) wait=true; set=true; shift ;;
-h|--help) usage ;;
--) shift; break ;;
@@
-93,6
+93,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
@@
-143,6
+149,7
@@
ack-wait() {
}
set-pxe() {
}
set-pxe() {
+ $dhcp || return 0
echo "$0: updating dnsmasq.conf:"
$type
${type:-:}|ssh wrt "cedit pxe /etc/dnsmasq.conf || /etc/init.d/dnsmasq restart
echo "$0: updating dnsmasq.conf:"
$type
${type:-:}|ssh wrt "cedit pxe /etc/dnsmasq.conf || /etc/init.d/dnsmasq restart
@@
-153,7
+160,7
@@
$([[ $type == arch ]] && echo arch-pxe-mount)"
if $set; then
set-pxe
if [[ $type == fai ]]; then
if $set; then
set-pxe
if [[ $type == fai ]]; then
- e myfai-chboot $
chboot_arg
$host
+ e myfai-chboot $
{chboot_args[@]}
$host
if $redep; then
e fai-redep
fi
if $redep; then
e fai-redep
fi