From 86109ad65ee28146045f1c08b7fa0193e5cd7dc1 Mon Sep 17 00:00:00 2001
From: teastep <teastep@fbd18981-670d-0410-9b5c-8dc0c1a9a2bb>
Date: Sun, 1 Feb 2004 22:50:45 +0000
Subject: [PATCH] Shorewall-2.0.0-Alpha2

git-svn-id: https://shorewall.svn.sourceforge.net/svnroot/shorewall/trunk@1114 fbd18981-670d-0410-9b5c-8dc0c1a9a2bb
---
 Shorewall2/fallback.sh  |  2 +-
 Shorewall2/install.sh   | 10 +++++++++-
 Shorewall2/uninstall.sh |  2 +-
 3 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/Shorewall2/fallback.sh b/Shorewall2/fallback.sh
index 2528b55c4..6f847a2a0 100755
--- a/Shorewall2/fallback.sh
+++ b/Shorewall2/fallback.sh
@@ -28,7 +28,7 @@
 #       shown below. Simply run this script to revert to your prior version of
 #       Shoreline Firewall.
 
-VERSION=2.0.0-Alpha1
+VERSION=2.0.0-Alpha2
 
 usage() # $1 = exit status
 {
diff --git a/Shorewall2/install.sh b/Shorewall2/install.sh
index 32c45df4a..b00fa2dc8 100755
--- a/Shorewall2/install.sh
+++ b/Shorewall2/install.sh
@@ -54,7 +54,7 @@
 #        /etc/rc.d/rc.local file is modified to start the firewall.
 #
 
-VERSION=2.0.0-Alpha1
+VERSION=2.0.0-Alpha2
 
 usage() # $1 = exit status
 {
@@ -176,9 +176,13 @@ fi
 #
 # Determine where to install the firewall script
 #
+DEBIAN=
+
 if [ -n "$PREFIX" ]; then
 	install -d -o $OWNER -g $GROUP -m 755 ${PREFIX}/sbin
 	install -d -o $OWNER -g $GROUP -m 755 ${PREFIX}${DEST}
+elif [ -d /etc/apt -a -e /usr/bin/dpkg ]; then
+    DEBIAN=yes
 fi
 
 FIREWALL="shorewall2"
@@ -555,11 +559,13 @@ if [ -z "$PREFIX" -a -n "$first_install" ]; then
 	ln -s ../init.d/shorewall2 /etc/rcS.d/S40shorewall2
 	echo
 	echo "Shorewall2 will start automatically at boot"
+	echo "Set startup=1 in /etc/default/shorewall2 to enable"
     else
 	if [ -x /sbin/insserv -o -x /usr/sbin/insserv ]; then
 	    if insserv /etc/init.d/shorewalls ; then
 		echo
 		echo "Shorewall2 will start automatically at boot"
+		echo "Remove /etc/shorewall2/startup_disabled in /etc/default/shorewall2 to enable"
 	    else
 		cant_autostart
 	    fi
@@ -567,6 +573,7 @@ if [ -z "$PREFIX" -a -n "$first_install" ]; then
 	    if chkconfig --add shorewall2 ; then
 		echo
 		echo "Shorewall2 will start automatically in run levels as follows:"
+		echo "Remove /etc/shorewall2/startup_disabled in /etc/default/shorewall2 to enable"
 		chkconfig --list $FIREWALL
 	    else
 		cant_autostart
@@ -575,6 +582,7 @@ if [ -z "$PREFIX" -a -n "$first_install" ]; then
 	    if rc-update add shorewall2 default; then
 		echo
 		echo "Shorewall2 will start automatically at boot"
+		echo "Remove /etc/shorewall2/startup_disabled in /etc/default/shorewall2 to enable"
 	    else
 		cant_autostart
 	    fi
diff --git a/Shorewall2/uninstall.sh b/Shorewall2/uninstall.sh
index b996b1efa..9951ad8ec 100755
--- a/Shorewall2/uninstall.sh
+++ b/Shorewall2/uninstall.sh
@@ -26,7 +26,7 @@
 #       You may only use this script to uninstall the version
 #       shown below. Simply run this script to remove Seattle Firewall
 
-VERSION=2.0.0-Alpha1
+VERSION=2.0.0-Alpha2
 
 usage() # $1 = exit status
 {