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://git.cdn.openwrt.org/?a=commitdiff_plain;h=276737e384c4c7f8e12d64ec02cf2bf6b5a1b96b;p=openwrt%2Fsvn-archive%2Farchive.git

don't override wan_ifname, if it's correct (eg. pppoe)


SVN-Revision: 479
---

diff --git a/openwrt/target/default/target_skeleton/etc/nvram.overrides b/openwrt/target/default/target_skeleton/etc/nvram.overrides
index 82c15900ea..094db457b2 100644
--- a/openwrt/target/default/target_skeleton/etc/nvram.overrides
+++ b/openwrt/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