[package] firewall: do not check for module availability, let iptables fail if a feature is not present (#7610)
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@28525 3c298f89-4303-0410-b956-a3cf2f4a3e73master
parent
59bf9e97fa
commit
6ee2c2b79c
|
@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
|
||||||
PKG_NAME:=firewall
|
PKG_NAME:=firewall
|
||||||
|
|
||||||
PKG_VERSION:=2
|
PKG_VERSION:=2
|
||||||
PKG_RELEASE:=35
|
PKG_RELEASE:=36
|
||||||
|
|
||||||
include $(INCLUDE_DIR)/package.mk
|
include $(INCLUDE_DIR)/package.mk
|
||||||
|
|
||||||
|
|
|
@ -74,21 +74,7 @@ fw__exec() { # <action> <family> <table> <chain> <target> <position> { <rules> }
|
||||||
fw__rc $(($? & 1))
|
fw__rc $(($? & 1))
|
||||||
return
|
return
|
||||||
fi
|
fi
|
||||||
local mod
|
fw__rc 0
|
||||||
eval "mod=\$FW_${fam#G}_${tab}"
|
|
||||||
if [ "$mod" ]; then
|
|
||||||
fw__rc $mod
|
|
||||||
return
|
|
||||||
fi
|
|
||||||
case "$fam" in
|
|
||||||
*4) mod=iptable_${tab} ;;
|
|
||||||
*6) mod=ip6table_${tab} ;;
|
|
||||||
*) mod=. ;;
|
|
||||||
esac
|
|
||||||
grep -q "^${mod} " /proc/modules
|
|
||||||
mod=$?
|
|
||||||
export FW_${fam}_${tab}=$mod
|
|
||||||
fw__rc $mod
|
|
||||||
}
|
}
|
||||||
|
|
||||||
fw__err() {
|
fw__err() {
|
||||||
|
|
Loading…
Reference in New Issue