From 3b76d11447518a2a4202fcef79b6712ef1c8c2a2 Mon Sep 17 00:00:00 2001 From: kaloz Date: Wed, 30 Mar 2005 16:37:03 +0000 Subject: [PATCH] don't override wan_ifname, if it's correct (eg. pppoe) git-svn-id: svn://svn.openwrt.org/openwrt/trunk@479 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- openwrt/target/default/target_skeleton/etc/nvram.overrides | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/openwrt/target/default/target_skeleton/etc/nvram.overrides b/openwrt/target/default/target_skeleton/etc/nvram.overrides index 82c15900e..094db457b 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