mirror of
https://gitlab.com/shorewall/code.git
synced 2024-12-18 12:20:42 +01:00
Tweak /sbin/shorewall-init
1) Make indentation consistent 2) Remove IPSET_SAVE logic Signed-off-by: Tom Eastep <teastep@shorewall.net>
This commit is contained in:
parent
aab6e67e70
commit
67a1438a41
@ -30,17 +30,15 @@ then
|
|||||||
fi
|
fi
|
||||||
|
|
||||||
# check if shorewall-init is configured or not
|
# check if shorewall-init is configured or not
|
||||||
if [ -f "/etc/sysconfig/shorewall-init" ]
|
if [ -f "/etc/sysconfig/shorewall-init" ]; then
|
||||||
then
|
. /etc/sysconfig/shorewall-init
|
||||||
. /etc/sysconfig/shorewall-init
|
if [ -z "$PRODUCTS" ]; then
|
||||||
if [ -z "$PRODUCTS" ]
|
echo "ERROR: No products configured" >&2
|
||||||
then
|
|
||||||
echo "ERROR: No products configured" >&2
|
|
||||||
exit 1
|
|
||||||
fi
|
|
||||||
else
|
|
||||||
echo "ERROR: /etc/sysconfig/shorewall-init not found" >&2
|
|
||||||
exit 1
|
exit 1
|
||||||
|
fi
|
||||||
|
else
|
||||||
|
echo "ERROR: /etc/sysconfig/shorewall-init not found" >&2
|
||||||
|
exit 1
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# Initialize the firewall
|
# Initialize the firewall
|
||||||
@ -59,10 +57,6 @@ shorewall_start () {
|
|||||||
fi
|
fi
|
||||||
done
|
done
|
||||||
|
|
||||||
if [ -n "$SAVE_IPSETS" -a -f "$SAVE_IPSETS" ]; then
|
|
||||||
ipset -R < "$SAVE_IPSETS"
|
|
||||||
fi
|
|
||||||
|
|
||||||
return 0
|
return 0
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -80,13 +74,6 @@ shorewall_stop () {
|
|||||||
fi
|
fi
|
||||||
done
|
done
|
||||||
|
|
||||||
if [ -n "$SAVE_IPSETS" ]; then
|
|
||||||
mkdir -p $(dirname "$SAVE_IPSETS")
|
|
||||||
if ipset -S > "${SAVE_IPSETS}.tmp"; then
|
|
||||||
grep -qE -- '^(-N|create )' "${SAVE_IPSETS}.tmp" && mv -f "${SAVE_IPSETS}.tmp" "$SAVE_IPSETS"
|
|
||||||
fi
|
|
||||||
fi
|
|
||||||
|
|
||||||
return 0
|
return 0
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user