From 0cf2b117e104948203d9ad6fcdd9709d9e7fdf06 Mon Sep 17 00:00:00 2001 From: mbm Date: Thu, 23 Sep 2004 06:55:06 +0000 Subject: [PATCH] fix potential routing issues in failsafe git-svn-id: svn://svn.openwrt.org/openwrt/trunk@169 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- .../sources/openwrt/root/etc/nvram.overrides | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/obsolete-buildroot/sources/openwrt/root/etc/nvram.overrides b/obsolete-buildroot/sources/openwrt/root/etc/nvram.overrides index 2bd9b46fc..acbba30a4 100644 --- a/obsolete-buildroot/sources/openwrt/root/etc/nvram.overrides +++ b/obsolete-buildroot/sources/openwrt/root/etc/nvram.overrides @@ -16,6 +16,7 @@ NVRAM_lan_proto="static" debug "### wrt54g 1.x hack ###" NVRAM_vlan1hwname="et0" NVRAM_vlan2hwname="et0" + FAILSAFE_ifnames="vlan1 vlan2 eth2" remap () { eval NVRAM_$1=\"$(nvram get $1 | awk 'gsub("eth0","vlan2") gsub("eth1","vlan1")')\" @@ -23,8 +24,8 @@ NVRAM_lan_proto="static" for type in lan wifi wan pppoe do - remap ${type}_ifname - remap ${type}_ifnames + remap ${type}_ifname + remap ${type}_ifnames done } @@ -33,6 +34,7 @@ NVRAM_lan_proto="static" [ "$(nvram get boardnum)" = "1024" ] && { debug "### wap54g hack ###" NVRAM_wan_ifname="none" + FAILSAFE_ifnames="eth0 eth1" } # defaults if lan_ifname is missing @@ -51,7 +53,7 @@ NVRAM_lan_proto="static" [ "$FAILSAFE" = "true" ] && { echo "### YOU ARE IN FAILSAFE MODE ####" NVRAM_lan_ifname="br0" - NVRAM_lan_ifnames="vlan0 vlan1 vlan2 eth0 eth1 eth2 eth3" + NVRAM_lan_ifnames=${FAILSAFE_ifnames:-"vlan0 vlan1 eth1"} NVRAM_lan_ipaddr="192.168.1.1" NVRAM_lan_netmask="255.255.255.0" NVRAM_lan_hwaddr="00:0B:AD:0A:DD:00" -- 2.20.1