From 8bc62d1474d1848acd9d1d6820f1c41c584a7db2 Mon Sep 17 00:00:00 2001
From: Tuomo Soini <tis@foobar.fi>
Date: Mon, 8 Jun 2015 22:15:35 +0300
Subject: [PATCH] Complete Shorewall-init improvements

completes 548c0558c15f1ec10b3782014cefa996c58db03f

Signed-off-by: Tuomo Soini <tis@foobar.fi>
---
 Shorewall-init/shorewall-init | 39 ++++++++++++++++-------------------
 1 file changed, 18 insertions(+), 21 deletions(-)

diff --git a/Shorewall-init/shorewall-init b/Shorewall-init/shorewall-init
index 8f2f4e03d..5b6e9ebc8 100644
--- a/Shorewall-init/shorewall-init
+++ b/Shorewall-init/shorewall-init
@@ -34,7 +34,9 @@ setstatedir() {
     [ -n "$statedir" ] && STATEDIR=${statedir} || STATEDIR=${VARLIB}/${PRODUCT}
 
     if [ $PRODUCT = shorewall -o $PRODUCT = shorewall6 ]; then
-	${SBINDIR}/$PRODUCT ${OPTIONS} compile -c || exit 1
+	${SBINDIR}/$PRODUCT ${OPTIONS} compile -c
+    else
+	return 0
     fi
 }
 
@@ -62,22 +64,17 @@ shorewall_start () {
 
     echo -n "Initializing \"Shorewall-based firewalls\": "
     for PRODUCT in $PRODUCTS; do
-	setstatedir
-
-	if [ -x ${STATEDIR}/firewall ]; then
-	    #
-	    # Run in a sub-shell to avoid name collisions
-	    #
-	    (
-		if ! ${STATEDIR}/firewall status > /dev/null 2>&1; then
-		    ${STATEDIR}/firewall ${OPTIONS} stop || exit 1
-		else
-		    exit 1
-		fi
-	    )
-	else
-	    echo ERROR:  ${STATEDIR}/firewall does not exist or is not executable!
-	    exit 1
+	if setstatedir; then
+	    if [ -x ${STATEDIR}/firewall ]; then
+		#
+		# Run in a sub-shell to avoid name collisions
+		#
+		(
+		    if ! ${STATEDIR}/firewall status > /dev/null 2>&1; then
+			${STATEDIR}/firewall ${OPTIONS} stop
+		    fi
+		)
+	    fi
 	fi
     done
 
@@ -95,10 +92,10 @@ shorewall_stop () {
 
     echo -n "Clearing \"Shorewall-based firewalls\": "
     for PRODUCT in $PRODUCTS; do
-	setstatedir
-
-	if [ -x ${STATEDIR}/firewall ]; then
-	    ${STATEDIR}/firewall ${OPTIONS} clear || exit 1
+	if setstatedir; then
+	    if [ -x ${STATEDIR}/firewall ]; then
+		${STATEDIR}/firewall ${OPTIONS} clear
+	    fi
 	fi
     done