diff options
| author | Jo-Philipp Wich <jow@openwrt.org> | 2009-08-10 23:48:10 +0000 |
|---|---|---|
| committer | Jo-Philipp Wich <jow@openwrt.org> | 2009-08-10 23:48:10 +0000 |
| commit | 27da9d1984e2c7eb45d00cb288b6063a8ff47170 (patch) | |
| tree | f339f91bc4244599390befbc45423f583059f664 /package | |
| parent | 6ccd4143eb2e40fea13b7064ee9e9c645b0c4572 (diff) | |
| download | master-31e0f0ae-27da9d1984e2c7eb45d00cb288b6063a8ff47170.tar.gz master-31e0f0ae-27da9d1984e2c7eb45d00cb288b6063a8ff47170.tar.bz2 master-31e0f0ae-27da9d1984e2c7eb45d00cb288b6063a8ff47170.zip | |
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
Diffstat (limited to 'package')
| -rw-r--r-- | package/base-files/Makefile | 2 | ||||
| -rw-r--r-- | package/base-files/files/etc/hotplug.d/net/10-net | 6 | ||||
| -rwxr-xr-x | package/base-files/files/lib/network/config.sh | 9 |
3 files changed, 7 insertions, 10 deletions
diff --git a/package/base-files/Makefile b/package/base-files/Makefile index 6901829f29..fb7debf96c 100644 --- a/package/base-files/Makefile +++ b/package/base-files/Makefile @@ -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/ diff --git a/package/base-files/files/etc/hotplug.d/net/10-net b/package/base-files/files/etc/hotplug.d/net/10-net index 06e5244447..f46dcd08d6 100644 --- a/package/base-files/files/etc/hotplug.d/net/10-net +++ b/package/base-files/files/etc/hotplug.d/net/10-net @@ -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;; diff --git a/package/base-files/files/lib/network/config.sh b/package/base-files/files/lib/network/config.sh index a5cadf61bd..bfadf40c89 100755 --- a/package/base-files/files/lib/network/config.sh +++ b/package/base-files/files/lib/network/config.sh @@ -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 |