From 2caba7da533543e42e1635f7e7e51cf6721b3f93 Mon Sep 17 00:00:00 2001
From: teastep <teastep@fbd18981-670d-0410-9b5c-8dc0c1a9a2bb>
Date: Mon, 10 May 2004 21:15:14 +0000
Subject: [PATCH] Shorewall 2.0.2 RC1

git-svn-id: https://shorewall.svn.sourceforge.net/svnroot/shorewall/trunk@1321 fbd18981-670d-0410-9b5c-8dc0c1a9a2bb
---
 Shorewall2/install.sh       | 16 +++++++---------
 Shorewall2/releasenotes.txt |  7 +++++++
 2 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/Shorewall2/install.sh b/Shorewall2/install.sh
index 553614424..4757883f1 100755
--- a/Shorewall2/install.sh
+++ b/Shorewall2/install.sh
@@ -83,10 +83,12 @@ install_file_with_backup() # $1 = source $2 = target $3 = mode
 # Parse the run line
 #
 # DEST is the SysVInit script directory
+# INIT is the name of the script in the $DEST directory
 # RUNLEVELS is the chkconfig parmeters for firewall
 # ARGS is "yes" if we've already parsed an argument
 #
-DEST=""
+DEST="/etc/init.d"
+INIT="shorewall"
 RUNLEVELS=""
 ARGS=""
 
@@ -117,10 +119,6 @@ done
 
 PATH=/sbin:/bin:/usr/sbin:/usr/bin:/usr/local/bin:/usr/local/sbin
 
-if [ -z "$DEST" ]; then
-    DEST=/etc/init.d
-fi
-
 #
 # Determine where to install the firewall script
 #
@@ -160,11 +158,11 @@ echo "shorewall control program installed in ${PREFIX}/sbin/shorewall"
 if [ -n "$DEBIAN" ]; then
     install_file_with_backup init.debian.sh /etc/init.d/shorewall 0544
 else
-    install_file_with_backup init.sh ${PREFIX}${DEST}/shorewall 0544
+    install_file_with_backup init.sh ${PREFIX}${DEST}/$INIT 0544
 fi
 
 echo
-echo  "Shorewall script installed in ${PREFIX}${DEST}/shorewall"
+echo  "Shorewall script installed in ${PREFIX}${DEST}/$INIT"
 
 #
 # Create /etc/shorewall, /usr/share/shorewall and /var/shorewall if needed
@@ -514,7 +512,7 @@ chmod 644 ${PREFIX}/usr/share/shorewall/version
 
 if [ -z "$PREFIX" ]; then
     rm -f /usr/share/shorewall/init
-    ln -s ${DEST}/shorewall /usr/share/shorewall/init
+    ln -s ${DEST}/${INIT} /usr/share/shorewall/init
 fi
 
 #
@@ -555,7 +553,7 @@ if [ -z "$PREFIX" -a -n "$first_install" ]; then
 	    else
 		cant_autostart
 	    fi
-	else
+	elif [ "$INIT" != rc.firewall ]; then #Slackware starts this automatically
 	    cant_autostart
 	fi
 
diff --git a/Shorewall2/releasenotes.txt b/Shorewall2/releasenotes.txt
index d29087b13..4881ebd1d 100755
--- a/Shorewall2/releasenotes.txt
+++ b/Shorewall2/releasenotes.txt
@@ -229,3 +229,10 @@ New Features:
     users who mis-used that script under Shorewall 1.x (the script was intended 
     for adding rules to the 'common' chain but many users treated it as a script
     for adding rules before Shorewall's).
+
+13) Installing/Upgrading Shorewall on Slackware has been
+    improved. Slackware users must use the tarball and must modify
+    settings in the install.sh script before running it as follows:
+
+    DEST="/etc/rc.d"
+    INIT="rc.firewall"
\ No newline at end of file