Merge branch '4.5.21'

This commit is contained in:
Tom Eastep 2013-12-18 07:16:12 -08:00
commit dd38cdc0f0

View File

@ -582,7 +582,7 @@ show_routing() {
determine_ipset_version() { determine_ipset_version() {
local setname local setname
if [ -z "$IPSET" -o $IPSET = ipset ]; then if [ -z "$IPSET" -o "$IPSET" = "ipset" ]; then
IPSET=$(mywhich ipset) IPSET=$(mywhich ipset)
[ -n "$IPSET" ] || fatal_error "The ipset utility cannot be located" [ -n "$IPSET" ] || fatal_error "The ipset utility cannot be located"
fi fi