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

diff --git a/pxe-server b/pxe-server
index e59854a..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() {
@@ -31,10 +31,25 @@ 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
+
+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
+           that is mid-install.
+
+-a         Don't setup pxe, just Wait for 2 dhcp acks, then disable the pxe
+           server after a delay.  First ack is for pxe boot, 2nd ack is
+           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
@@ -43,17 +58,6 @@ rm tftpboot
 ln -s <arch/debian iso dir> tftpboot
 
 
--r         Don't redeploy fai config. For example, if there is a different host
-           that is mid-install.
--a         Wait for 2 dhcp acks, then disable the pxe server after a delay.
-           First ack is for pxe boot, 2nd ack is 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.
--w         Initially setup pxe, then wait like -a.
--h|--help  Print help and exit
-
-
 Note: Uses GNU getopt options parsing style
 EOF
     exit $1
@@ -61,16 +65,16 @@ EOF
 
 ##### begin command line parsing ########
 
-args=()
 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 ;;
@@ -78,7 +82,7 @@ while true; do
     esac
 done
 
-read host type <<<"$@"
+read -r host type <<<"$@"
 
 case $# in
     0|2);;
@@ -89,7 +93,7 @@ case $# in
         ;;
 esac
 
-if [[ $host ]]; then
+if [[ $host && $host != default ]]; then
     host_tag="tag:$host,"
 fi
 
@@ -118,8 +122,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
 }
 
@@ -130,8 +133,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
@@ -141,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)"
 }
@@ -149,12 +153,14 @@ $([[ $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
     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