From fd828773122ef2b3db773e85d85ee2c4afc2836e Mon Sep 17 00:00:00 2001
From: Tom Eastep <teastep@shorewall.net>
Date: Mon, 26 Mar 2012 07:49:49 -0700
Subject: [PATCH] Another fix for init.sh

Signed-off-by: Tom Eastep <teastep@shorewall.net>
---
 Shorewall-lite/init.sh  | 8 ++++----
 Shorewall/init.sh       | 8 ++++----
 Shorewall6-lite/init.sh | 8 ++++----
 Shorewall6/init.sh      | 8 ++++----
 4 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/Shorewall-lite/init.sh b/Shorewall-lite/init.sh
index 811720d70..3d342cc14 100755
--- a/Shorewall-lite/init.sh
+++ b/Shorewall-lite/init.sh
@@ -65,7 +65,7 @@ OPTIONS=
 if [ ~/.shorewallrc ]; then
     . ~/.shorewallrc || exit 1
 else
-    SBIN=/sbin
+    SBINDIR=/sbin
     SYSCONFDIR=/etc/sysconfig
 fi
 
@@ -82,13 +82,13 @@ command="$1"
 
 case "$command" in
     start)
-	exec ${SBIN}/shorewall-lite $OPTIONS start $STARTOPTIONS
+	exec ${SBINDIR}/shorewall-lite $OPTIONS start $STARTOPTIONS
 	;;
     restart|reload)
-	exec ${SBIN}/shorewall-lite $OPTIONS restart $RESTARTOPTIONS
+	exec ${SBINDIR}/shorewall-lite $OPTIONS restart $RESTARTOPTIONS
 	;;
     status|stop)
-	exec ${SBIN}/shorewall-lite $OPTIONS $command $@
+	exec ${SBINDIR}/shorewall-lite $OPTIONS $command $@
 	;;
     *)
 	usage
diff --git a/Shorewall/init.sh b/Shorewall/init.sh
index 743033d90..b96c7319c 100755
--- a/Shorewall/init.sh
+++ b/Shorewall/init.sh
@@ -66,7 +66,7 @@ OPTIONS="-v0"
 if [ ~/.shorewallrc ]; then
     . ~/.shorewallrc || exit 1
 else
-    SBIN=/sbin
+    SBINDIR=/sbin
     SYSCONFDIR=/etc/sysconfig
 fi
 
@@ -84,13 +84,13 @@ shift
 
 case "$command" in
     start)
-	exec $SBIN/shorewall $OPTIONS start $STARTOPTIONS
+	exec $SBINDIR/shorewall $OPTIONS start $STARTOPTIONS
 	;;
     restart|reload)
-	exec $SBIN/shorewall $OPTIONS restart $RESTARTOPTIONS
+	exec $SBINDIR/shorewall $OPTIONS restart $RESTARTOPTIONS
 	;;
     status|stop)
-	exec $SBIN/shorewall $OPTIONS $command
+	exec $SBINDIR/shorewall $OPTIONS $command
 	;;
     *)
 	usage
diff --git a/Shorewall6-lite/init.sh b/Shorewall6-lite/init.sh
index 61868d706..6de96a233 100755
--- a/Shorewall6-lite/init.sh
+++ b/Shorewall6-lite/init.sh
@@ -65,7 +65,7 @@ OPTIONS=
 if [ ~/.shorewallrc ]; then
     . ~/.shorewallrc || exit 1
 else
-    SBIN=/sbin
+    SBINDIR=/sbin
     SYSCONFDIR=/etc/sysconfig
 fi
 
@@ -82,13 +82,13 @@ command="$1"
 
 case "$command" in
     start)
-	exec ${SBIN}/shorewall6-lite $OPTIONS start $STARTOPTIONS
+	exec ${SBINDIR}/shorewall6-lite $OPTIONS start $STARTOPTIONS
 	;;
     restart|reload)
-	exec ${SBIN}/shorewall6-lite $OPTIONS restart $RESTARTOPTIONS
+	exec ${SBINDIR}/shorewall6-lite $OPTIONS restart $RESTARTOPTIONS
 	;;
     status|stop)
-	exec ${SBIN}/shorewall6-lite $OPTIONS $command $@
+	exec ${SBINDIR}/shorewall6-lite $OPTIONS $command $@
 	;;
     *)
 	usage
diff --git a/Shorewall6/init.sh b/Shorewall6/init.sh
index 4448854a6..5d08a5065 100755
--- a/Shorewall6/init.sh
+++ b/Shorewall6/init.sh
@@ -66,7 +66,7 @@ OPTIONS="-v0"
 if [ ~/.shorewallrc ]; then
     . ~/.shorewallrc || exit 1
 else
-    SBIN=/sbin
+    SBINDIR=/sbin
     SYSCONFDIR=/etc/sysconfig
 fi
 
@@ -85,13 +85,13 @@ command="$1"
 
 case "$command" in
     start)
-	exec ${SBIN}/shorewall6 $OPTIONS start $STARTOPTIONS
+	exec ${SBINDIR}/shorewall6 $OPTIONS start $STARTOPTIONS
 	;;
     restart|reload)
-	exec ${SBIN}/shorewall6 $OPTIONS restart $RESTARTOPTIONS
+	exec ${SBINDIR}/shorewall6 $OPTIONS restart $RESTARTOPTIONS
 	;;
     status|stop)
-	exec ${SBIN}/shorewall6 $OPTIONS $command $@
+	exec ${SBINDIR}/shorewall6 $OPTIONS $command $@
 	;;
     *)
 	usage