From 3435b15679e8d5929b62cbf6542cb2b3c170fd2a Mon Sep 17 00:00:00 2001
From: Tim Niemeyer <tim.niemeyer@mastersword.de>
Date: Sat, 30 Mar 2013 02:01:42 +0100
Subject: [PATCH] DIR/Fonera: Force dhcp off on

Signed-off-by: Tim Niemeyer <tim.niemeyer@mastersword.de>
---
 bsp/board_dir300.bsp                          |  3 ++
 bsp/board_fonera.bsp                          |  3 ++
 .../root_file_system/etc/config/network       |  3 +-
 .../root_file_system/etc/config/network       |  3 +-
 build_patches/dont_overwrite_wan_config.patch | 38 +++++++++++++++++++
 5 files changed, 48 insertions(+), 2 deletions(-)
 create mode 100644 build_patches/dont_overwrite_wan_config.patch

diff --git a/bsp/board_dir300.bsp b/bsp/board_dir300.bsp
index c7482ac..fcbc430 100644
--- a/bsp/board_dir300.bsp
+++ b/bsp/board_dir300.bsp
@@ -4,6 +4,9 @@ target=$builddir/$machine
 
 board_prepare() {
     cat ./bsp/$machine/000-squashfs-image-params.patch | patch -p0 -d $target
+
+    cat build_patches/dont_overwrite_wan_config.patch | patch -p0 -d $target
+    /bin/rm $target/target/linux/atheros/base-files/etc/uci-defaults/network
 }
 
 board_prebuild() {
diff --git a/bsp/board_fonera.bsp b/bsp/board_fonera.bsp
index c9768c6..8babd29 100644
--- a/bsp/board_fonera.bsp
+++ b/bsp/board_fonera.bsp
@@ -4,6 +4,9 @@ target=$builddir/$machine
 
 board_prepare() {
     cat ./bsp/$machine/000-squashfs-image-params.patch | patch -p0 -d $target
+    
+    cat build_patches/dont_overwrite_wan_config.patch | patch -p0 -d $target
+    /bin/rm $target/target/linux/atheros/base-files/etc/uci-defaults/network
 }
 
 board_prebuild() {
diff --git a/bsp/dir300/root_file_system/etc/config/network b/bsp/dir300/root_file_system/etc/config/network
index 026bdb1..7467494 100644
--- a/bsp/dir300/root_file_system/etc/config/network
+++ b/bsp/dir300/root_file_system/etc/config/network
@@ -39,5 +39,6 @@ config 'switch_vlan' 'eth0_3'
 config 'interface' 'ethmesh'
         option 'ifname' 'eth0.3'
 
-config 'interface' 'wan'
+config 'interface' 'unused'
         option 'ifname' 'eth0.2'
+        option 'proto' 'static'
diff --git a/bsp/fonera/root_file_system/etc/config/network b/bsp/fonera/root_file_system/etc/config/network
index 4ffd311..e5c49c0 100644
--- a/bsp/fonera/root_file_system/etc/config/network
+++ b/bsp/fonera/root_file_system/etc/config/network
@@ -31,8 +31,9 @@ config 'interface' 'wlanmesh'
 
 
 # this is for the WAN/VPN on the Ethernet Port
-config 'interface' 'wan'
+config 'interface' 'unused'
         option 'ifname' 'eth0'
+        option 'proto' 'static'
 config 'interface' 'mesh'
         option 'type' 'bridge'
         option 'ifname' 'bat0 tap0'
diff --git a/build_patches/dont_overwrite_wan_config.patch b/build_patches/dont_overwrite_wan_config.patch
new file mode 100644
index 0000000..6ffb2f4
--- /dev/null
+++ b/build_patches/dont_overwrite_wan_config.patch
@@ -0,0 +1,38 @@
+Index: package/base-files/files/lib/functions/uci-defaults.sh
+===================================================================
+--- package/base-files/files/lib/functions/uci-defaults.sh	(Revision 35298)
++++ package/base-files/files/lib/functions/uci-defaults.sh	(Arbeitskopie)
+@@ -166,33 +166,15 @@
+ 
+ ucidef_set_interface_lan() {
+ 	local ifname=$1
+-
+-	uci batch <<EOF
+-set network.lan='interface'
+-set network.lan.ifname='$ifname'
+-set network.lan.type='bridge'
+-set network.lan.proto='static'
+-set network.lan.ipaddr='192.168.1.1'
+-set network.lan.netmask='255.255.255.0'
+-EOF
+ }
+ 
+ ucidef_set_interface_wan() {
+ 	local ifname=$1
+-
+-	uci batch <<EOF
+-set network.wan='interface'
+-set network.wan.ifname='$ifname'
+-set network.wan.proto='dhcp'
+-EOF
+ }
+ 
+ ucidef_set_interfaces_lan_wan() {
+ 	local lan_ifname=$1
+ 	local wan_ifname=$2
+-
+-	ucidef_set_interface_lan "$lan_ifname"
+-	ucidef_set_interface_wan "$wan_ifname"
+ }
+ 
+ ucidef_set_interface_macaddr() {