From: Florian Fainelli Date: Wed, 11 Jan 2006 16:13:25 +0000 (+0000) Subject: Fixed network autoconfiguration as explained in #200, fixes #200 X-Git-Url: http://207.154.207.93/?a=commitdiff_plain;h=51d83bd931a6a993db7251300196c2992d0740a5;p=15.05%2Fopenwrt.git Fixed network autoconfiguration as explained in #200, fixes #200 git-svn-id: svn://svn.openwrt.org/openwrt/trunk@2912 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- diff --git a/openwrt/package/base-files/default/etc/hotplug.d/net/10-net b/openwrt/package/base-files/default/etc/hotplug.d/net/10-net index 187b937c60..b63eba090b 100644 --- a/openwrt/package/base-files/default/etc/hotplug.d/net/10-net +++ b/openwrt/package/base-files/default/etc/hotplug.d/net/10-net @@ -1,6 +1,9 @@ #!/bin/sh setup_eth() { + for part in $(nvram get unused_ifnames); do + [ "$part" = "$INTERFACE" ] && return 0 + done [ -f /proc/net/wl0 ] && { lsmod | grep wlcompat >&- || insmod wlcompat } diff --git a/openwrt/target/linux/package/base-files/files/brcm-2.6/etc/init.d/S05netconfig b/openwrt/target/linux/package/base-files/files/brcm-2.6/etc/init.d/S05netconfig index 27336e112e..3c4c032563 100755 --- a/openwrt/target/linux/package/base-files/files/brcm-2.6/etc/init.d/S05netconfig +++ b/openwrt/target/linux/package/base-files/files/brcm-2.6/etc/init.d/S05netconfig @@ -57,7 +57,7 @@ END { # WAP54G if ((nvram["boardnum"] == "2") || \ (nvram["boardnum"] == "1024")) { - c["lan_ifnames"]="eth0 eth1" + c["lan_ifnames"]="eth1 eth2" c["wan_ifname"]="" } @@ -78,6 +78,7 @@ END { print "# lan_gateway=\"192.168.1.1\"" print "" + p("unused_ifnames") print "" print "#### WAN configuration"