X-Git-Url: https://iankelling.org/git/?p=automated-distro-installer;a=blobdiff_plain;f=pxe-server;h=7fced849def066ca634f42b3ab20f27708c9bc94;hp=c19f6d2eeadbe95449003b5f12543266aa4739c1;hb=a2b8051e808621b9a33617d0c75d212bd2141ddc;hpb=175cf089388948672b5b4b6f9a8cf5a96a7015f2

diff --git a/pxe-server b/pxe-server
index c19f6d2..7fced84 100755
--- a/pxe-server
+++ b/pxe-server
@@ -15,12 +15,6 @@
 # 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.
 
 
 x="$(readlink -f "$BASH_SOURCE")"; source "${x%/*}/bash-trace"
@@ -29,14 +23,15 @@ x="$(readlink -f "$BASH_SOURCE")"; source "${x%/*}/bash-trace"
 usage() {
     cat <<EOF
 Usage: ${0##*/} [OPTIONS] [HOST TYPE]
-Configure dnsmasq pxe server options and fai-chboot if appropriate.
+Configure dnsmasq boot options and fai-chboot if appropriate.
 
-Without HOST TYPE, disable pxe server and fai server.
+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.
 
@@ -65,6 +60,7 @@ EOF
 
 ##### begin command line parsing ########
 
+dhcp=true
 redep=true
 acks=2
 wait=false
@@ -73,6 +69,7 @@ eval set -- "$temp"
 while true; do
     case $1 in
         -a) wait=true; set=false; shift ;;
+        -d) dhcp=false; shift ;;
         -r) redep=false; shift ;;
         -S) chboot_arg=-S; shift ;;
         -w) wait=true; set=true; shift ;;
@@ -143,6 +140,7 @@ ack-wait() {
 }
 
 set-pxe() {
+    $dhcp || return 0
     echo "$0: updating dnsmasq.conf:"
     $type
     ${type:-:}|ssh wrt "cedit pxe /etc/dnsmasq.conf || /etc/init.d/dnsmasq restart