aboutsummaryrefslogtreecommitdiffstats
path: root/target
diff options
context:
space:
mode:
authorImre Kaloz <kaloz@openwrt.org>2005-03-30 16:37:03 +0000
committerImre Kaloz <kaloz@openwrt.org>2005-03-30 16:37:03 +0000
commita80fe8578034a8d2000ff7ed905d73113211cfcd (patch)
tree4407923e0670093b254585954b73f63251a964eb /target
parent597fbf02b7e92e2ece6ceb7581cae4aca2299aac (diff)
downloadupstream-a80fe8578034a8d2000ff7ed905d73113211cfcd.tar.gz
upstream-a80fe8578034a8d2000ff7ed905d73113211cfcd.tar.bz2
upstream-a80fe8578034a8d2000ff7ed905d73113211cfcd.zip
don't override wan_ifname, if it's correct (eg. pppoe)
git-svn-id: svn://svn.openwrt.org/openwrt/trunk/openwrt@479 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target')
-rw-r--r--target/default/target_skeleton/etc/nvram.overrides4
1 files changed, 3 insertions, 1 deletions
diff --git a/target/default/target_skeleton/etc/nvram.overrides b/target/default/target_skeleton/etc/nvram.overrides
index 82c15900ea..094db457b2 100644
--- a/target/default/target_skeleton/etc/nvram.overrides
+++ b/target/default/target_skeleton/etc/nvram.overrides
@@ -65,7 +65,9 @@ NVRAM_lan_proto="static"
NVRAM_vlan0hwname="et0"
NVRAM_vlan1hwname="et0"
NVRAM_lan_ifnames="vlan0 eth1"
- NVRAM_wan_ifname="vlan1"
+ [ "$(nvram get wan_ifname)" = "eth0.1" ] && {
+ NVRAM_wan_ifname="vlan1"
+ }
}
# defaults if lan_ifname is missing