aboutsummaryrefslogtreecommitdiffstats
path: root/package/base-files/files/etc
diff options
context:
space:
mode:
authorJo-Philipp Wich <jow@openwrt.org>2009-08-10 23:48:10 +0000
committerJo-Philipp Wich <jow@openwrt.org>2009-08-10 23:48:10 +0000
commit27da9d1984e2c7eb45d00cb288b6063a8ff47170 (patch)
treef339f91bc4244599390befbc45423f583059f664 /package/base-files/files/etc
parent6ccd4143eb2e40fea13b7064ee9e9c645b0c4572 (diff)
downloadupstream-27da9d1984e2c7eb45d00cb288b6063a8ff47170.tar.gz
upstream-27da9d1984e2c7eb45d00cb288b6063a8ff47170.tar.bz2
upstream-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/base-files/files/etc')
-rw-r--r--package/base-files/files/etc/hotplug.d/net/10-net6
1 files changed, 6 insertions, 0 deletions
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;;