[debian-lan-devel] [SCM] Debian-LAN development and packaging branch, master, updated. 0.6-46-gd64bc6b

[Andreas B. Mundt]

The following commit has been merged in the master branch:
commit d64bc6b29a6e1a150518de9f53b4051ff338b6f9
Author: Andreas B. Mundt <andi at debian.org>
Date:   Sat Sep 22 13:05:51 2012 +0200

    Fix typo in debian-lan script.  Switch default network topology.
    
    Assume the use of a dedicated gateway by default.  This setup is more
    common than the setup where the mainserver acts as gateway.

diff --git a/fai/config/class/SERVER_A.var b/fai/config/class/SERVER_A.var
index 173cbe8..34bbbd5 100644
--- a/fai/config/class/SERVER_A.var
+++ b/fai/config/class/SERVER_A.var
@@ -34,7 +34,7 @@ LDAP_ADMIN_PW=
 ## address for mainserver ($MAINSERVER_IPADDR) and gateway ($GATEWAY),
 ## the mainserver is configured as gateway to the external network.
 ## You'll need two network cards in that case.
-MAINSERVER_IPADDR="10.0.0.1"
+MAINSERVER_IPADDR="10.0.0.10"
 GATEWAY="10.0.0.1"
 BROADCAST="10.0.255.255"
 NAMESERVER_IPADDR=""  # leave empty to use mainserver's IP address
diff --git a/fai/config/files/usr/local/sbin/debian-lan/SERVER_A b/fai/config/files/usr/local/sbin/debian-lan/SERVER_A
index 4186bcb..ab1f937 100755
--- a/fai/config/files/usr/local/sbin/debian-lan/SERVER_A
+++ b/fai/config/files/usr/local/sbin/debian-lan/SERVER_A
@@ -185,10 +185,10 @@ EOF
 	;;
     add2dhcp)
 	## GW: gateway hardware address
-	GW=`ip route show | grep default | egrep -o '[1-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}'`
+	GW=`ip route show | grep default | egrep -o '[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}'`
 	## locHW: all local hardware addresses
 	locHW=`ip addr show | grep -o "\w\{2\}:\w\{2\}:\w\{2\}:\w\{2\}:\w\{2\}:\w\{2\}" | sort -u | sed '1d;$d'`
-	## allHW: all known hardware addresses with gateway address removed
+        ## allHW: all known hardware addresses with gateway address removed
 	allHW=`ip neigh show | sed "/$GW/d" | grep -o "\w\{2\}:\w\{2\}:\w\{2\}:\w\{2\}:\w\{2\}:\w\{2\}" | sort -u`
 	for HWaddr in $allHW ; do
 	    if echo $locHW | grep -q $HWaddr ; then

-- 
Debian-LAN development and packaging