diff --git a/nodogsplash/Makefile b/nodogsplash/Makefile index a599823..dd2b1e4 100644 --- a/nodogsplash/Makefile +++ b/nodogsplash/Makefile @@ -10,7 +10,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=nodogsplash PKG_FIXUP:=autoreconf PKG_VERSION:=0.9_beta9.9.8 -PKG_RELEASE:=1 +PKG_RELEASE:=2 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)/ PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz diff --git a/nodogsplash/files/nodogsplash.init b/nodogsplash/files/nodogsplash.init index 7eba60b..b465792 100644 --- a/nodogsplash/files/nodogsplash.init +++ b/nodogsplash/files/nodogsplash.init @@ -13,6 +13,7 @@ IPT=/usr/sbin/iptables WD_DIR=/usr/bin +NDS_CONF=/etc/nodogsplash/nodogsplash.conf OPTIONS="" START=65 STOP=65 @@ -168,9 +169,11 @@ test_module() { do_module_tests "ipt_mac" do_module_tests "ipt_mark" - # if not using traffic control, - # you can comment out the following 3 lines: - do_module_tests "imq" "numdevs=2" - do_module_tests "ipt_IMQ" - do_module_tests "sch_htb" + + # test for imq modules, only if TrafficControl is enabled in conf + if ( grep -q -E '^[[:space:]]*TrafficControl[[:space:]]+(yes|true|1)' "$NDS_CONF" ) ; then + do_module_tests "imq" "numdevs=2" + do_module_tests "ipt_IMQ" + do_module_tests "sch_htb" + fi }