X-Git-Url: https://iankelling.org/git/?a=blobdiff_plain;f=pxe-server;h=e59854a85e466be75cbad22733ded83cae6c077e;hb=1fe036ae3d279dbd1d60bef38dc42154507892c4;hp=0bdd13401e4238995ca0ccec985c0ca88d7ddf73;hpb=2eebb95531424e04797094d622eebdd7ece5b38b;p=automated-distro-installer

diff --git a/pxe-server b/pxe-server
index 0bdd134..e59854a 100755
--- a/pxe-server
+++ b/pxe-server
@@ -28,13 +28,23 @@ trap 'echo "$0:$LINENO:error: \"$BASH_COMMAND\" returned $?" >&2' ERR
 
 usage() {
     cat <<EOF
-Usage: ${0##*/} [OPTIONS] TYPE [HOST]
-One line description
+Usage: ${0##*/} [OPTIONS] [HOST TYPE]
+Configure dnsmasq pxe server options and fai-chboot if appropriate.
 
-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.
+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
+
+
+-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
@@ -68,12 +78,16 @@ while true; do
     esac
 done
 
-read type host <<<"$@"
+read host type <<<"$@"
 
-if [[ ! $type ]]; then
-    echo "$0: error: exptected 1 argument of type"
-    usage 1
-fi
+case $# in
+    0|2);;
+    *)
+        echo "$0: error: expected 0 or 2 arguments"
+        echo
+        usage 1
+        ;;
+esac
 
 if [[ $host ]]; then
     host_tag="tag:$host,"
@@ -105,7 +119,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.lan,faiserver.lan
 EOF
 }
 
@@ -127,19 +141,20 @@ 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"
+    ${type:-:}|ssh wrt "cedit pxe /etc/dnsmasq.conf || /etc/init.d/dnsmasq restart
+$([[ $type == arch ]] && echo arch-pxe-mount)"
 }
 
 
 if $set; then
     set-pxe
-
     if [[ $type == fai ]]; then
+        e myfai-chboot $host
         if $redep; then
-            fai-redep
+            e fai-redep
         fi
-        faiserver-enable
+    else
+        e myfai-chboot
     fi
 fi
 
@@ -150,7 +165,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,