X-Git-Url: https://iankelling.org/git/?a=blobdiff_plain;f=pxe-server;h=fb92d66c82b736692ce2d9849491c4798d83101e;hb=cf778f7a65037a2a54e2b6008511f0a584326ce9;hp=9c3f917fcaceee7a488453759aa6eed44b528250;hpb=bcdb96792264d6cda20e6d2fa176728a67c87862;p=automated-distro-installer

diff --git a/pxe-server b/pxe-server
index 9c3f917..fb92d66 100755
--- a/pxe-server
+++ b/pxe-server
@@ -29,19 +29,30 @@ 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. 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.
+
+-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.
+
+-w         Setup pxe, then wait like -a.
 -h|--help  Print help and exit
 
 
@@ -145,7 +156,9 @@ if $set; 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