X-Git-Url: https://iankelling.org/git/?a=blobdiff_plain;f=pxe-server;h=e59854a85e466be75cbad22733ded83cae6c077e;hb=a018c3030b0ebd751d5667efd96c2fd32f2423e0;hp=6adbf19214286141b7622392f3ceff35226a1f5d;hpb=d6df8985152a6c17523cedc3fee62694544eeaf2;p=automated-distro-installer

diff --git a/pxe-server b/pxe-server
index 6adbf19..e59854a 100755
--- a/pxe-server
+++ b/pxe-server
@@ -29,12 +29,22 @@ trap 'echo "$0:$LINENO:error: \"$BASH_COMMAND\" returned $?" >&2' ERR
 usage() {
     cat <<EOF
 Usage: ${0##*/} [OPTIONS] [HOST TYPE]
-One line description
+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, or none to disable
+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.
+-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
@@ -139,14 +149,12 @@ $([[ $type == arch ]] && echo arch-pxe-mount)"
 if $set; then
     set-pxe
     if [[ $type == fai ]]; then
-        myfai-chboot $host
+        e myfai-chboot $host
         if $redep; then
-            fai-redep
+            e fai-redep
         fi
-        faiserver-enable
     else
-        myfai-chboot
-        faiserver-disable
+        e myfai-chboot
     fi
 fi
 
@@ -157,6 +165,7 @@ if $wait; then
     # bleh.
     echo "waiting for $acks dhcp acks then disabling pxe"
     ack-wait $acks
+    type=
     set-pxe
 
     # previously tried waiting for one more ack then disabling faiserver,