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 82c15900ea99a0a8ce1b3805bcaeda240a94a8e4..094db457b2072f11f4a58d269f79c0ebe0a6c979 100644 (file)
--- 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_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
 }
 
 # defaults if lan_ifname is missing