From: Rosy Song Date: Sun, 23 Sep 2018 02:05:04 +0000 (+0800) Subject: netifd: do not validate relevant section when ipv6 is not supported X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=a6add47869972139cef9106aecfddbac0b3f64f4;p=openwrt%2Fstaging%2Fneocturne.git netifd: do not validate relevant section when ipv6 is not supported Signed-off-by: Rosy Song --- diff --git a/package/network/config/netifd/Makefile b/package/network/config/netifd/Makefile index b511b5d0cf..1694a5fda9 100644 --- a/package/network/config/netifd/Makefile +++ b/package/network/config/netifd/Makefile @@ -1,7 +1,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=netifd -PKG_RELEASE:=1 +PKG_RELEASE:=2 PKG_SOURCE_PROTO:=git PKG_SOURCE_URL=$(PROJECT_GIT)/project/netifd.git diff --git a/package/network/config/netifd/files/etc/init.d/network b/package/network/config/netifd/files/etc/init.d/network index 6cd167d19d..99d9f6582f 100755 --- a/package/network/config/netifd/files/etc/init.d/network +++ b/package/network/config/netifd/files/etc/init.d/network @@ -133,9 +133,9 @@ service_triggers() procd_open_validate validate_atm_bridge_section validate_route_section - validate_route6_section + [ -e /proc/sys/net/ipv6 ] && validate_route6_section validate_rule_section - validate_rule6_section + [ -e /proc/sys/net/ipv6 ] && validate_rule6_section validate_switch_section validate_switch_vlan procd_close_validate