base-files: ensure that ipv6 is loaded if interfaces have an ip6addr defined, clean trailing whitespace, bump pkg revision (#5356)
SVN-Revision: 17118
This commit is contained in:
parent
2c08ff242a
commit
3bb5ea71eb
2 changed files with 22 additions and 13 deletions
|
@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
|
|||
include $(INCLUDE_DIR)/kernel.mk
|
||||
|
||||
PKG_NAME:=base-files
|
||||
PKG_RELEASE:=24
|
||||
PKG_RELEASE:=25
|
||||
|
||||
PKG_FILE_DEPENDS:=$(PLATFORM_DIR)/ $(GENERIC_PLATFORM_DIR)/base-files/
|
||||
|
||||
|
|
|
@ -226,6 +226,7 @@ setup_interface() {
|
|||
local vifmac="$4"
|
||||
local proto
|
||||
local macaddr
|
||||
local hasipv6
|
||||
|
||||
[ -n "$config" ] || {
|
||||
config=$(find_config "$iface")
|
||||
|
@ -243,6 +244,14 @@ 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.
|
||||
config_get hasipv6 "$config" ip6addr
|
||||
[ -n "$hasipv6" ] && [ ! -d /proc/sys/net/ipv6 ] && {
|
||||
grep -q '^ipv6' /etc/modules.d/* && insmod ipv6
|
||||
}
|
||||
|
||||
# Interface settings
|
||||
config_get mtu "$config" mtu
|
||||
config_get macaddr "$config" macaddr
|
||||
|
|
Loading…
Reference in a new issue