diff options
| author | florian <florian@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2006-01-11 16:13:25 +0000 |
|---|---|---|
| committer | florian <florian@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2006-01-11 16:13:25 +0000 |
| commit | 97c71e562b95953d2391743167112314f01315ee (patch) | |
| tree | be2b836f6daefd7e7bf717666906a27d4c2e35ec | |
| parent | 2c74298f7cbb59ba44fc7d692baed554687df4a6 (diff) | |
Fixed network autoconfiguration as explained in #200, fixes #200
git-svn-id: svn://svn.openwrt.org/openwrt/trunk/openwrt@2912 3c298f89-4303-0410-b956-a3cf2f4a3e73
| -rw-r--r-- | package/base-files/default/etc/hotplug.d/net/10-net | 3 | ||||
| -rwxr-xr-x | target/linux/package/base-files/files/brcm-2.6/etc/init.d/S05netconfig | 3 |
2 files changed, 5 insertions, 1 deletions
diff --git a/package/base-files/default/etc/hotplug.d/net/10-net b/package/base-files/default/etc/hotplug.d/net/10-net index 187b937c6..b63eba090 100644 --- a/package/base-files/default/etc/hotplug.d/net/10-net +++ b/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/target/linux/package/base-files/files/brcm-2.6/etc/init.d/S05netconfig b/target/linux/package/base-files/files/brcm-2.6/etc/init.d/S05netconfig index 27336e112..3c4c03256 100755 --- a/target/linux/package/base-files/files/brcm-2.6/etc/init.d/S05netconfig +++ b/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" |