formatting and dns changes

[automated-distro-installer] / pxe-server

diff --git a/pxe-server b/pxe-server
index c19f6d2eeadbe95449003b5f12543266aa4739c1..b1700beab398c08cdc9b1a9b60b99112209b0008 100755 (executable)
--- 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,14 +60,16 @@ EOF
 
 ##### begin command line parsing ########
 
+dhcp=true
 redep=true
 acks=2
 wait=false
-temp=$(getopt -l help harSw "$@") || usage 1
+temp=$(getopt -l help adrSwh "$@") || usage 1
 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 ;;
@@ -93,6 +90,12 @@ case $# in
         ;;
 esac
 
+if $wait && ! $dhcp; then
+    echo "$0: error -w conflicts with -d, choose one or other"
+    exit 1
+fi
+
+
 if [[ $host && $host != default ]]; then
     host_tag="tag:$host,"
 fi
@@ -143,6 +146,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