X-Git-Url: https://iankelling.org/git/?a=blobdiff_plain;f=pxe-server;h=a59e71c5d48676fd61a6cfc78954f01c8de623fe;hb=c992f0c63e79ea31154671410b51213e4624422c;hp=9e74eeb757a030c9a367fabb3c8440597188d043;hpb=7f77555b3d92709034fe41919358053c650c71e1;p=automated-distro-installer

diff --git a/pxe-server b/pxe-server
index 9e74eeb..a59e71c 100755
--- a/pxe-server
+++ b/pxe-server
@@ -15,34 +15,23 @@
 # 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.
 
-set -eE -o pipefail
-trap 'echo "$0:$LINENO:error: \"$BASH_COMMAND\" returned $?" >&2' ERR
+x="$(readlink -f "$BASH_SOURCE")"; source "${x%/*}/bash-trace"
 
 
 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  server and fai server.
 
-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.
 
+-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.
 
@@ -51,11 +40,20 @@ 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.
+-k         Pass -k to myfai-chboot.
 -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
@@ -63,16 +61,20 @@ EOF
 
 ##### begin command line parsing ########
 
-args=()
+dhcp=true
 redep=true
 acks=2
 wait=false
-temp=$(getopt -l help harw "$@") || 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 ;;
+        -d) dhcp=false; shift ;;
         -r) redep=false; shift ;;
+        -S) chboot_args+=(-S); shift ;;
+        -k) chboot_args+=(-k); shift ;;
         -w) wait=true; set=true; shift ;;
         -h|--help) usage ;;
         --) shift; break ;;
@@ -80,7 +82,7 @@ while true; do
     esac
 done
 
-read host type <<<"$@"
+read -r host type <<<"$@"
 
 case $# in
     0|2);;
@@ -91,7 +93,13 @@ case $# in
         ;;
 esac
 
-if [[ $host ]]; then
+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
 
@@ -120,8 +128,7 @@ EOF
 
 fai() {
     cat <<EOF
-$set_host_tag
-dhcp-boot=${host_tag}pxelinux.0,faiserver.lan,faiserver.lan
+dhcp-boot=${host_tag}pxelinux.0,faiserver.b8.nz,faiserver.b8.nz
 EOF
 }
 
@@ -132,8 +139,7 @@ ack-wait() {
     fi
     regex=".*DHCPACK.*$host_regex$"
     i=0
-    tmp=$(mktemp)
-    while (( i != wait_count )) && read line; do
+    while (( i != wait_count )) && read -r line; do
         if [[ $line =~ $regex ]]; then
             i=$((i+1))
             echo $line
@@ -143,6 +149,9 @@ ack-wait() {
 }
 
 set-pxe() {
+    $dhcp || return 0
+    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)"
 }
@@ -151,12 +160,14 @@ $([[ $type == arch ]] && echo arch-pxe-mount)"
 if $set; then
     set-pxe
     if [[ $type == fai ]]; then
-        e myfai-chboot $host
+        e myfai-chboot ${chboot_args[@]} $host
         if $redep; then
             e fai-redep
         fi
     else
-        e myfai-chboot
+        # This will fail if faiserver is not setup, so ignore any
+        # failure and don't bother us about it.
+        myfai-chboot &>/dev/null ||:
     fi
 fi