Changeset 17217


Ignore:
Timestamp:
2009-08-11T01:48:10+02:00 (8 years ago)
Author:
jow
Message:

[package] base-files: move ipv6 module loading from setup_interface() to addif() in the hotplug call, this ensures that ipv6 is loaded before any interfaces or aliases with ip6addr option are configured (#5356)

Location:
trunk/package/base-files
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • trunk/package/base-files/Makefile

    r17169 r17217  
    1010 
    1111PKG_NAME:=base-files 
    12 PKG_RELEASE:=25 
     12PKG_RELEASE:=26 
    1313 
    1414PKG_FILE_DEPENDS:=$(PLATFORM_DIR)/ $(GENERIC_PLATFORM_DIR)/base-files/ 
  • trunk/package/base-files/files/etc/hotplug.d/net/10-net

    r12026 r17217  
    44 
    55addif() { 
     6        # Ensure that ipv6 is loaded, autoloading happens later but ipv6 might be 
     7        # required now for interface setup. 
     8        [ -d /proc/sys/net/ipv6 ] || { 
     9                grep -q '^ipv6' /etc/modules.d/* && insmod ipv6 
     10        } 
     11 
    612        # PPP devices are configured by pppd, no need to run setup_interface here 
    713        case "$INTERFACE" in 
  • trunk/package/base-files/files/lib/network/config.sh

    r17160 r17217  
    252252        } 
    253253 
    254         # Check whether this interface has an IPv6 address 
    255         # defined and ensure that the kmod is loaded since 
    256         # ifup could be triggered before modules are loaded. 
    257         local hasipv6 
    258         config_get hasipv6 "$config" ip6addr 
    259         [ -n "$hasipv6" ] && [ ! -d /proc/sys/net/ipv6 ] && { 
    260                 grep -q '^ipv6' /etc/modules.d/* && insmod ipv6 
    261         } 
    262  
    263254        # Interface settings 
    264255        grep "$iface:" /proc/net/dev > /dev/null && { 
Note: See TracChangeset for help on using the changeset viewer.