X-Git-Url: https://iankelling.org/git/?a=blobdiff_plain;f=pxe-server;h=c19f6d2eeadbe95449003b5f12543266aa4739c1;hb=e6c8a36522847eca91819ab3eb656dd824bc3e3c;hp=ec4606012a9703d1f70e2088f051057cbd2e1c44;hpb=efcfb463ceda4de1d9953da31a2c0737471e5cf8;p=automated-distro-installer

diff --git a/pxe-server b/pxe-server
index ec46060..c19f6d2 100755
--- 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() {
@@ -45,7 +45,7 @@ TYPE       One of arch, plain, fai.
            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         Pass -S to fai-chboot.
+-S         sets FAI_ACTION=sysinfo, see myfai-chboot for more info.
 -w         Setup pxe, then wait like -a.
 -h|--help  Print help and exit
 
@@ -122,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
 }
 
@@ -143,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)"
 }