Changeset 17218


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

[8.09] merge fix from r17217, bump patch level

Location:
branches/8.09/package/base-files
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • branches/8.09/package/base-files/Makefile

    r17119 r17218  
    1111 
    1212PKG_NAME:=base-files 
    13 PKG_RELEASE:=14.4 
     13PKG_RELEASE:=14.5 
    1414 
    1515PKG_FILE_DEPEND:=$(PLATFORM_DIR)/ $(GENERIC_PLATFORM_DIR)/base-files/ 
  • branches/8.09/package/base-files/files/etc/hotplug.d/net/10-net

    r12026 r17218  
    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 
  • branches/8.09/package/base-files/files/lib/network/config.sh

    r17119 r17218  
    227227        local proto 
    228228        local macaddr 
    229         local hasipv6 
    230229 
    231230        [ -n "$config" ] || { 
     
    243242                ifconfig "$iface" up 
    244243                sleep 1 
    245         } 
    246  
    247         # Check whether this interface has an IPv6 address 
    248         # defined and ensure that the kmod is loaded since 
    249         # ifup could be triggered before modules are loaded. 
    250         config_get hasipv6 "$config" ip6addr 
    251         [ -n "$hasipv6" ] && [ ! -d /proc/sys/net/ipv6 ] && { 
    252                 grep -q '^ipv6' /etc/modules.d/* && insmod ipv6 
    253244        } 
    254245 
Note: See TracChangeset for help on using the changeset viewer.