[8.09] merge fix from r17217, bump patch level
authorJo-Philipp Wich <jow@openwrt.org>
Mon, 10 Aug 2009 23:54:44 +0000 (23:54 +0000)
committerJo-Philipp Wich <jow@openwrt.org>
Mon, 10 Aug 2009 23:54:44 +0000 (23:54 +0000)
SVN-Revision: 17218

package/base-files/Makefile
package/base-files/files/etc/hotplug.d/net/10-net
package/base-files/files/lib/network/config.sh

index 1bc0e43..5e5c337 100644 (file)
@@ -10,7 +10,7 @@ include $(TOPDIR)/rules.mk
 include $(INCLUDE_DIR)/kernel.mk
 
 PKG_NAME:=base-files
-PKG_RELEASE:=14.4
+PKG_RELEASE:=14.5
 
 PKG_FILE_DEPEND:=$(PLATFORM_DIR)/ $(GENERIC_PLATFORM_DIR)/base-files/
 
index 06e5244..f46dcd0 100644 (file)
@@ -3,6 +3,12 @@
 include /lib/network
 
 addif() {
+       # Ensure that ipv6 is loaded, autoloading happens later but ipv6 might be
+       # required now for interface setup.
+       [ -d /proc/sys/net/ipv6 ] || {
+               grep -q '^ipv6' /etc/modules.d/* && insmod ipv6
+       }
+
        # PPP devices are configured by pppd, no need to run setup_interface here
        case "$INTERFACE" in
                ppp*) return 0;;
index 5fe7e50..fb3c1a2 100755 (executable)
@@ -226,7 +226,6 @@ setup_interface() {
        local vifmac="$4"
        local proto
        local macaddr
-       local hasipv6
 
        [ -n "$config" ] || {
                config=$(find_config "$iface")
@@ -244,14 +243,6 @@ setup_interface() {
                sleep 1
        }
 
-       # Check whether this interface has an IPv6 address
-       # defined and ensure that the kmod is loaded since
-       # ifup could be triggered before modules are loaded.
-       config_get hasipv6 "$config" ip6addr
-       [ -n "$hasipv6" ] && [ ! -d /proc/sys/net/ipv6 ] && {
-               grep -q '^ipv6' /etc/modules.d/* && insmod ipv6
-       }
-
        # Interface settings
        config_get mtu "$config" mtu
        config_get macaddr "$config" macaddr