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)

SVN-Revision: 17217
This commit is contained in:
Jo-Philipp Wich 2009-08-10 23:48:10 +00:00
parent 6ccd4143eb
commit 27da9d1984
3 changed files with 7 additions and 10 deletions

View File

@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
include $(INCLUDE_DIR)/kernel.mk
PKG_NAME:=base-files
PKG_RELEASE:=25
PKG_RELEASE:=26
PKG_FILE_DEPENDS:=$(PLATFORM_DIR)/ $(GENERIC_PLATFORM_DIR)/base-files/

View 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;;

View File

@ -251,15 +251,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.
local hasipv6
config_get hasipv6 "$config" ip6addr
[ -n "$hasipv6" ] && [ ! -d /proc/sys/net/ipv6 ] && {
grep -q '^ipv6' /etc/modules.d/* && insmod ipv6
}
# Interface settings
grep "$iface:" /proc/net/dev > /dev/null && {
local mtu macaddr