From: Imre Kaloz <kaloz@openwrt.org>
Date: Wed, 30 Mar 2005 16:37:03 +0000 (+0000)
Subject: don't override wan_ifname, if it's correct (eg. pppoe)
X-Git-Url: http://207.154.207.93/?a=commitdiff_plain;h=a80fe8578034a8d2000ff7ed905d73113211cfcd;p=15.05%2Fopenwrt.git

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
---

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