From d465f2258fa2cc8a67eb3d9ed4563ce7719c03ac Mon Sep 17 00:00:00 2001
From: teastep <teastep@fbd18981-670d-0410-9b5c-8dc0c1a9a2bb>
Date: Sat, 10 Jun 2006 13:32:56 +0000
Subject: [PATCH] Avoid use of symbolic link /sbin/shorewall from init scripts

git-svn-id: https://shorewall.svn.sourceforge.net/svnroot/shorewall/trunk@4052 fbd18981-670d-0410-9b5c-8dc0c1a9a2bb
---
 Shorewall-lite/init.archlinux.sh | 6 +++---
 Shorewall-lite/init.debian.sh    | 2 +-
 Shorewall-lite/init.sh           | 6 +++---
 Shorewall/init.archlinux.sh      | 6 +++---
 Shorewall/init.debian.sh         | 2 +-
 Shorewall/init.sh                | 6 +++---
 docs/CompiledPrograms.xml        | 9 ++++++++-
 7 files changed, 22 insertions(+), 15 deletions(-)

diff --git a/Shorewall-lite/init.archlinux.sh b/Shorewall-lite/init.archlinux.sh
index 91040787c..ac775c84a 100755
--- a/Shorewall-lite/init.archlinux.sh
+++ b/Shorewall-lite/init.archlinux.sh
@@ -20,7 +20,7 @@ DAEMON_NAME="shorewall" # of course shorewall is NOT a deamon.
 case "$1" in
 	start)
 		stat_busy "Starting $DAEMON_NAME"
-		/sbin/shorewall $OPTIONS start &>/dev/null
+		/usr/share/shorewall-lite/shorewall $OPTIONS start &>/dev/null
 		if [ $? -gt 0 ]; then
 			stat_fail
 		else
@@ -32,7 +32,7 @@ case "$1" in
 
 	stop)
 		stat_busy "Stopping $DAEMON_NAME"
-		/sbin/shorewall stop &>/dev/null
+		/usr/share/shorewall-lite/shorewall stop &>/dev/null
 		if [ $? -gt 0 ]; then
 			stat_fail
 		else
@@ -43,7 +43,7 @@ case "$1" in
 
 	restart|reload)
 		stat_busy "Restarting $DAEMON_NAME"
-		/sbin/shorewall restart &>/dev/null
+		/usr/share/shorewall-lite/shorewall restart &>/dev/null
 		if [ $? -gt 0  ]; then
 			stat_fail
 		else
diff --git a/Shorewall-lite/init.debian.sh b/Shorewall-lite/init.debian.sh
index f7e8eef77..c175b71bb 100755
--- a/Shorewall-lite/init.debian.sh
+++ b/Shorewall-lite/init.debian.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-SRWL=/sbin/shorewall
+SRWL=/usr/share/shorewall-lite/shorewall
 WAIT_FOR_IFUP=/usr/share/shorewall/wait4ifup
 # Note, set INITLOG to /dev/null if you do not want to
 # keep logs of the firewall (not recommended)
diff --git a/Shorewall-lite/init.sh b/Shorewall-lite/init.sh
index 07e32bdf6..e29922b8f 100755
--- a/Shorewall-lite/init.sh
+++ b/Shorewall-lite/init.sh
@@ -74,14 +74,14 @@ command="$1"
 
 case "$command" in
     start)
-	exec /sbin/shorewall $OPTIONS $@
+	exec /usr/share/shorewall-lite/shorewall $OPTIONS $@
 	;;
     stop|restart|status)
-	exec /sbin/shorewall $@
+	exec /usr/share/shorewall-lite/shorewall $@
 	;;
     reload)
 	shift
-	exec /sbin/shorewall restart $@
+	exec /usr/share/shorewall-lite/shorewall restart $@
 	;;
     *)
 	usage
diff --git a/Shorewall/init.archlinux.sh b/Shorewall/init.archlinux.sh
index 91040787c..2bd56ecbe 100755
--- a/Shorewall/init.archlinux.sh
+++ b/Shorewall/init.archlinux.sh
@@ -20,7 +20,7 @@ DAEMON_NAME="shorewall" # of course shorewall is NOT a deamon.
 case "$1" in
 	start)
 		stat_busy "Starting $DAEMON_NAME"
-		/sbin/shorewall $OPTIONS start &>/dev/null
+		/usr/share/shorewall/shorewall $OPTIONS start &>/dev/null
 		if [ $? -gt 0 ]; then
 			stat_fail
 		else
@@ -32,7 +32,7 @@ case "$1" in
 
 	stop)
 		stat_busy "Stopping $DAEMON_NAME"
-		/sbin/shorewall stop &>/dev/null
+		/usr/share/shorewall/shorewall stop &>/dev/null
 		if [ $? -gt 0 ]; then
 			stat_fail
 		else
@@ -43,7 +43,7 @@ case "$1" in
 
 	restart|reload)
 		stat_busy "Restarting $DAEMON_NAME"
-		/sbin/shorewall restart &>/dev/null
+		/usr/share/shorewall restart &>/dev/null
 		if [ $? -gt 0  ]; then
 			stat_fail
 		else
diff --git a/Shorewall/init.debian.sh b/Shorewall/init.debian.sh
index 232736a47..e11cf1a79 100755
--- a/Shorewall/init.debian.sh
+++ b/Shorewall/init.debian.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-SRWL=/sbin/shorewall
+SRWL=/usr/share/shorewall/shorewall
 WAIT_FOR_IFUP=/usr/share/shorewall/wait4ifup
 # Note, set INITLOG to /dev/null if you do not want to
 # keep logs of the firewall (not recommended)
diff --git a/Shorewall/init.sh b/Shorewall/init.sh
index aa1200f66..db4747e83 100755
--- a/Shorewall/init.sh
+++ b/Shorewall/init.sh
@@ -74,14 +74,14 @@ command="$1"
 
 case "$command" in
     start)
-	exec /sbin/shorewall $OPTIONS $@
+	exec /usr/share/shorewall/shorewall $OPTIONS $@
 	;;
     stop|restart|status)
-	exec /sbin/shorewall $@
+	exec /usr/share/shorewall/shorewall $@
 	;;
     reload)
 	shift
-	exec /sbin/shorewall restart $@
+	exec /usr/share/shorewall/shorewall restart $@
 	;;
     *)
 	usage
diff --git a/docs/CompiledPrograms.xml b/docs/CompiledPrograms.xml
index b131b36bd..c440201eb 100644
--- a/docs/CompiledPrograms.xml
+++ b/docs/CompiledPrograms.xml
@@ -276,6 +276,9 @@
         <para>Modify <filename>/etc/shorewall-lite/shorewall.conf</filename>
         as needed.</para>
 
+        <para>If you are running Debian or one of its derivatives like Ubuntu
+        then edit /etc/default/shorewall-lite and set startup=1.</para>
+
         <programlisting><command>shorewall start</command></programlisting>
       </listitem>
     </orderedlist>
@@ -395,6 +398,10 @@
           <para>Modify <filename>/etc/shorewall-lite/shorewall.conf</filename>
           as needed.</para>
 
+          <para>If you are running Debian or one of its derivatives like
+          Ubuntu then edit /etc/default/shorewall-lite and set
+          startup=1.</para>
+
           <programlisting><command>shorewall start</command></programlisting>
         </listitem>
       </orderedlist>
@@ -495,4 +502,4 @@ MANGLE_FORWARD                  # Mangle table has FORWARD chain</programlisting
     is the level specified in the shorewall.conf file used when then program
     was compiled.</para>
   </section>
-</article>
\ No newline at end of file
+</article>