nodogsplash: check if TrafficControl is enabled before testing imq module requirement.

This avoids failing to start in current OpenWrt Attitude Adjustment and trunk,
which lack IMQ support (and WONTFIX). Suggested in the issue discussed in:
http://ml.ninux.org/pipermail/nodogsplash/2013-May/000009.html

Signed-off-by: Gui Iribarren <gui@altermundi.net>
This commit is contained in:
Gui Iribarren 2013-12-15 08:31:50 -03:00
parent e459ca61d2
commit 4bcf0bc5a8
2 changed files with 9 additions and 6 deletions

View File

@ -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

View File

@ -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 '^[[:space:]]*TrafficControl[[:space:]]\+yes' "$NDS_CONF" ) ; then
do_module_tests "imq" "numdevs=2"
do_module_tests "ipt_IMQ"
do_module_tests "sch_htb"
fi
}