diff --git a/Shorewall-init/shorewall-init b/Shorewall-init/shorewall-init index 0edfef5e6..be192b4db 100644 --- a/Shorewall-init/shorewall-init +++ b/Shorewall-init/shorewall-init @@ -24,20 +24,6 @@ # along with this program; if not, see . # ############################################################################### -# -# Check to see if any of the products are running. If so, issue a warning -# and exits with value 1 -firewall_stopped() { - for product in $PRODUCTS; do - if $product status > /dev/null 2>&1; then - echo " WARNING: $product is running -- ignoring $1 command" >&2 - return 1 - fi - done - - return 0 -} - # set the STATEDIR variable setstatedir() { local statedir @@ -56,6 +42,23 @@ setstatedir() { fi } +# +# This is modified by the installer when ${SHAREDIR} <> /usr/share +# +. /usr/share/shorewall/shorewallrc + +# check if shorewall-init is configured or not +if [ -f "$SYSCONFDIR/shorewall-init" ]; then + . $SYSCONFDIR/shorewall-init + if [ -z "$PRODUCTS" ]; then + echo "ERROR: No products configured" >&2 + exit 1 + fi +else + echo "ERROR: ${SYSCONFDIR}/shorewall-init not found" >&2 + exit 1 +fi + # Initialize the firewall shorewall_start () { local PRODUCT @@ -106,29 +109,12 @@ shorewall_stop () { return 0 } -# -# This is modified by the installer when ${SHAREDIR} <> /usr/share -# -. /usr/share/shorewall/shorewallrc - -# check if shorewall-init is configured or not -if [ -f "$SYSCONFDIR/shorewall-init" ]; then - . $SYSCONFDIR/shorewall-init - if [ -z "$PRODUCTS" ]; then - echo "ERROR: No products configured" >&2 - exit 1 - fi -else - echo "ERROR: ${SYSCONFDIR}/shorewall-init not found" >&2 - exit 1 -fi - case "$1" in start) - firewall_stopped 'start' && shorewall_start + shorewall_start ;; stop) - firewall_stopped 'stop' && shorewall_stop + shorewall_stop ;; *) echo "Usage: $0 {start|stop}"