[debian-lan-devel] [SCM] Debian-LAN development and packaging branch, master, updated. debian/0.10-6-g8af88c1

[Andreas B. Mundt]

The following commit has been merged in the master branch:
commit 8af88c196bf133bb55addf35fa88cc68b1dc42ad
Author: Andreas B. Mundt <andi at debian.org>
Date:   Sun May 19 13:04:43 2013 +0200

    Rename variable, BROADCAST is already used by FAI.

diff --git a/fai/config/class/SERVER_A.var b/fai/config/class/SERVER_A.var
index 4bfae82..3028380 100644
--- a/fai/config/class/SERVER_A.var
+++ b/fai/config/class/SERVER_A.var
@@ -39,7 +39,7 @@ LDAP_ADMIN_PW=
 ## interactively during installation, see below.
 MAINSERVER_IPADDR=${MAINSERVER_IPADDR:-''}
 GATEWAY=${GATEWAY:-''}
-BROADCAST=${BROADCAST:-'10.0.255.255'}
+BROADCAST_LAN=${BROADCAST_LAN:-'10.0.255.255'}
 NAMESERVER_IPADDR=""  # leave empty to use mainserver's IP address
 
 if [ -z "$GATEWAY" ] || [ -z "$MAINSERVER_IPADDR" ] ; then
diff --git a/fai/config/scripts/NTP_SERVER/10-ntp.conf b/fai/config/scripts/NTP_SERVER/10-ntp.conf
index 8b1895d..0d8ccca 100755
--- a/fai/config/scripts/NTP_SERVER/10-ntp.conf
+++ b/fai/config/scripts/NTP_SERVER/10-ntp.conf
@@ -8,7 +8,7 @@ control:
 editfiles:
    any::
 	{ ${target}/etc/ntp.conf
-	  ReplaceAll "#broadcast 192.168.123.255" With "broadcast ${BROADCAST}"
+	  ReplaceAll "#broadcast 192.168.123.255" With "broadcast ${BROADCAST_LAN}"
 	  AppendIfNoSuchLine "server 127.127.1.0 # local clock"
 	  AppendIfNoSuchLine "fudge  127.127.1.0 stratum 10"
 	}
diff --git a/fai/config/scripts/SERVER_A/10-misc b/fai/config/scripts/SERVER_A/10-misc
index d4f2b81..f0f4c71 100755
--- a/fai/config/scripts/SERVER_A/10-misc
+++ b/fai/config/scripts/SERVER_A/10-misc
@@ -49,7 +49,7 @@ auto eth0
 iface eth0 inet static
       address   ${MAINSERVER_IPADDR}
       netmask   ${NETMASK}
-      broadcast ${BROADCAST}
+      broadcast ${BROADCAST_LAN}
 EOF
 
 if [ "$MAINSERVER_IPADDR" != "$GATEWAY" ] ; then

-- 
Debian-LAN development and packaging