Merge branch 'upstream', fai 5.4

[automated-distro-installer] / pxe-server

diff --git a/pxe-server b/pxe-server
index a3df1a5953846368397e9b335be844970b132771..c19f6d2eeadbe95449003b5f12543266aa4739c1 100755 (executable)
--- a/pxe-server
+++ b/pxe-server
@@ -22,8 +22,8 @@
 # default distro is the base debian/fedora type. others are fai & arch.
 # for no pxe server, use a no-op like : or true.
 
-set -eE -o pipefail
-trap 'echo "$0:$LINENO:error: \"$BASH_COMMAND\" returned $?" >&2' ERR
+
+x="$(readlink -f "$BASH_SOURCE")"; source "${x%/*}/bash-trace"
 
 
 usage() {
@@ -31,16 +31,10 @@ usage() {
 Usage: ${0##*/} [OPTIONS] [HOST TYPE]
 Configure dnsmasq pxe server options and fai-chboot if appropriate.
 
-
 Without HOST TYPE, disable pxe server and fai server.
-TYPE is one of arch, plain, fai.
-HOST is a hostname known to the dhcp server, or default for all
-Note, when switching between plain and arch, you will need to
-do something like:
-ssh wrt
-cd /mnt/usb
-rm tftpboot
-ln -s <arch/debian iso dir> tftpboot
+
+HOST       A hostname known to the dhcp server, or default for all.
+TYPE       One of arch, plain, fai.
 
 
 -r         Don't redeploy fai config. For example, if there is a different host
@@ -51,11 +45,19 @@ ln -s <arch/debian iso dir> tftpboot
            for os boot. Sometimes 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.
-
+-S         sets FAI_ACTION=sysinfo, see myfai-chboot for more info.
 -w         Setup pxe, then wait like -a.
 -h|--help  Print help and exit
 
 
+Note, when switching between plain and arch, you will need to
+do something like:
+ssh wrt
+cd /mnt/usb
+rm tftpboot
+ln -s <arch/debian iso dir> tftpboot
+
+
 Note: Uses GNU getopt options parsing style
 EOF
     exit $1
@@ -66,12 +68,13 @@ EOF
 redep=true
 acks=2
 wait=false
-temp=$(getopt -l help harw "$@") || usage 1
+temp=$(getopt -l help harSw "$@") || usage 1
 eval set -- "$temp"
 while true; do
     case $1 in
         -a) wait=true; set=false; shift ;;
         -r) redep=false; shift ;;
+        -S) chboot_arg=-S; shift ;;
         -w) wait=true; set=true; shift ;;
         -h|--help) usage ;;
         --) shift; break ;;
@@ -90,7 +93,7 @@ case $# in
         ;;
 esac
 
-if [[ $host ]]; then
+if [[ $host && $host != default ]]; then
     host_tag="tag:$host,"
 fi
 
@@ -119,7 +122,7 @@ EOF
 
 fai() {
     cat <<EOF
-dhcp-boot=${host_tag}pxelinux.0,faiserver.lan,faiserver.lan
+dhcp-boot=${host_tag}pxelinux.0,faiserver.b8.nz,faiserver.b8.nz
 EOF
 }
 
@@ -140,6 +143,8 @@ ack-wait() {
 }
 
 set-pxe() {
+    echo "$0: updating dnsmasq.conf:"
+    $type
     ${type:-:}|ssh wrt "cedit pxe /etc/dnsmasq.conf || /etc/init.d/dnsmasq restart
 $([[ $type == arch ]] && echo arch-pxe-mount)"
 }
@@ -148,7 +153,7 @@ $([[ $type == arch ]] && echo arch-pxe-mount)"
 if $set; then
     set-pxe
     if [[ $type == fai ]]; then
-        e myfai-chboot $host
+        e myfai-chboot $chboot_arg $host
         if $redep; then
             e fai-redep
         fi