aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRosy Song <rosysong@rosinson.com>2018-09-23 10:05:04 +0800
committerHans Dedecker <dedeckeh@gmail.com>2018-09-25 22:35:38 +0200
commita6add47869972139cef9106aecfddbac0b3f64f4 (patch)
tree3ccb5ca921e16513fe66e29b269c095145fcf05a
parent61a59949009993a6b1d634ecbce765b37c4c2560 (diff)
downloadupstream-a6add47869972139cef9106aecfddbac0b3f64f4.tar.gz
upstream-a6add47869972139cef9106aecfddbac0b3f64f4.tar.bz2
upstream-a6add47869972139cef9106aecfddbac0b3f64f4.zip
netifd: do not validate relevant section when ipv6 is not supported
Signed-off-by: Rosy Song <rosysong@rosinson.com>
-rw-r--r--package/network/config/netifd/Makefile2
-rwxr-xr-xpackage/network/config/netifd/files/etc/init.d/network4
2 files changed, 3 insertions, 3 deletions
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