DIR/Fonera: Force dhcp off on

Signed-off-by: Tim Niemeyer <tim.niemeyer@mastersword.de>
This commit is contained in:
Tim Niemeyer 2013-03-30 02:01:42 +01:00
parent 00d1d2c987
commit 3435b15679
5 changed files with 48 additions and 2 deletions

View file

@ -4,6 +4,9 @@ target=$builddir/$machine
board_prepare() { board_prepare() {
cat ./bsp/$machine/000-squashfs-image-params.patch | patch -p0 -d $target 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() { board_prebuild() {

View file

@ -4,6 +4,9 @@ target=$builddir/$machine
board_prepare() { board_prepare() {
cat ./bsp/$machine/000-squashfs-image-params.patch | patch -p0 -d $target 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() { board_prebuild() {

View file

@ -39,5 +39,6 @@ config 'switch_vlan' 'eth0_3'
config 'interface' 'ethmesh' config 'interface' 'ethmesh'
option 'ifname' 'eth0.3' option 'ifname' 'eth0.3'
config 'interface' 'wan' config 'interface' 'unused'
option 'ifname' 'eth0.2' option 'ifname' 'eth0.2'
option 'proto' 'static'

View file

@ -31,8 +31,9 @@ config 'interface' 'wlanmesh'
# this is for the WAN/VPN on the Ethernet Port # this is for the WAN/VPN on the Ethernet Port
config 'interface' 'wan' config 'interface' 'unused'
option 'ifname' 'eth0' option 'ifname' 'eth0'
option 'proto' 'static'
config 'interface' 'mesh' config 'interface' 'mesh'
option 'type' 'bridge' option 'type' 'bridge'
option 'ifname' 'bat0 tap0' option 'ifname' 'bat0 tap0'

View file

@ -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() {