X-Git-Url: https://iankelling.org/git/?a=blobdiff_plain;f=pxe-server;h=b1700beab398c08cdc9b1a9b60b99112209b0008;hb=5f680f6bea2faae10ca8e5ccea0d08d18ccc9aa1;hp=6b6a5765e2571c2550cc64b53ffbbed24bdba2ea;hpb=bf19e9969f50a637c8fabf724eb9e292da472e01;p=automated-distro-installer

diff --git a/pxe-server b/pxe-server
index 6b6a576..b1700be 100755
--- a/pxe-server
+++ b/pxe-server
@@ -15,34 +15,44 @@
 # 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] TYPE [HOST]
-One line description
-
-TYPE is one of arch, plain, fai, or : for no pxe server.
-HOST makes the pxe server only for that specific host
-
--r         Don't redeploy fai config.
--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.
+Usage: ${0##*/} [OPTIONS] [HOST TYPE]
+Configure dnsmasq boot options and fai-chboot if appropriate.
+
+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.
+
+-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.
+
+-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
+cd /mnt/usb
+rm tftpboot
+ln -s <arch/debian iso dir> tftpboot
+
+
 Note: Uses GNU getopt options parsing style
 EOF
     exit $1
@@ -50,30 +60,43 @@ EOF
 
 ##### begin command line parsing ########
 
-args=()
+dhcp=true
 redep=true
 acks=2
 wait=false
-temp=$(getopt -l help hra "$@") || usage 1
+temp=$(getopt -l help adrSwh "$@") || usage 1
 eval set -- "$temp"
 while true; do
     case $1 in
-        -h|--help) usage ;;
+        -a) wait=true; set=false; shift ;;
+        -d) dhcp=false; shift ;;
         -r) redep=false; shift ;;
-        -a) wait=true; shift ;;
+        -S) chboot_arg=-S; shift ;;
+        -w) wait=true; set=true; shift ;;
+        -h|--help) usage ;;
         --) shift; break ;;
         *) echo "$0: Internal error!" ; exit 1 ;;
     esac
 done
 
-read type host <<<"$@"
+read -r host type <<<"$@"
+
+case $# in
+    0|2);;
+    *)
+        echo "$0: error: expected 0 or 2 arguments"
+        echo
+        usage 1
+        ;;
+esac
 
-if [[ ! $type ]]; then
-    echo "$0: error: exptected 1 argument of type"
-    usage 1
+if $wait && ! $dhcp; then
+    echo "$0: error -w conflicts with -d, choose one or other"
+    exit 1
 fi
 
-if [[ $host ]]; then
+
+if [[ $host && $host != default ]]; then
     host_tag="tag:$host,"
 fi
 
@@ -102,8 +125,7 @@ EOF
 
 fai() {
     cat <<EOF
-$set_host_tag
-dhcp-boot=${host_tag}fai/pxelinux.0,faiserver.lan,faiserver.lan
+dhcp-boot=${host_tag}pxelinux.0,faiserver.b8.nz,faiserver.b8.nz
 EOF
 }
 
@@ -114,8 +136,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
@@ -125,18 +146,25 @@ ack-wait() {
 }
 
 set-pxe() {
-    ${1:-$type} | ssh wrt "cedit pxe-server /etc/dnsmasq.conf || /etc/init.d/dnsmasq restart
-if [[ $type == arch ]]; then arch-pxe-mount; fi"
+    $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)"
 }
 
-if ! $wait && [[ $type != : ]]; then
-    set-pxe
 
+if $set; then
+    set-pxe
     if [[ $type == fai ]]; then
+        e myfai-chboot $chboot_arg $host
         if $redep; then
-            fai-redep
+            e fai-redep
         fi
-        faiserver-enable
+    else
+        # 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
 
@@ -147,7 +175,8 @@ if $wait; then
     # bleh.
     echo "waiting for $acks dhcp acks then disabling pxe"
     ack-wait $acks
-    set-pxe :
+    type=
+    set-pxe
 
     # previously tried waiting for one more ack then disabling faiserver,
     # since it can contain sensitive info, so turn it off when not in use,