Prevent pre-configuration startup; change version to 1.3.9

git-svn-id: https://shorewall.svn.sourceforge.net/svnroot/shorewall/trunk@250 fbd18981-670d-0410-9b5c-8dc0c1a9a2bb

Shorewall/fallback.sh

@@ -28,7 +28,7 @@
 #       shown below. Simply run this script to revert to your prior version of 
 #       Shoreline Firewall.
 
-VERSION=1.3.8
+VERSION=1.3.9
 
 usage() # $1 = exit status
 {

Shorewall/firewall

@@ -3252,6 +3252,15 @@ activate_rules()
 ################################################################################
 define_firewall() # $1 = Command (Start or Restart)
 {
+    if [ -f /etc/shorewall/startup_disabled ]; then
+	echo "   Shorewall Startup is disabled -- to enable startup"
+	echo "   after you have completed Shorewall configuration,"
+	echo "   remove the file /etc/shorewall/startup_disabled"
+
+	my_mutex_off
+	exit 2
+    fi
+
     echo "${1}ing Shorewall..."
 
     verify_os_version

Shorewall/install.sh

@@ -54,7 +54,7 @@
 #        /etc/rc.d/rc.local file is modified to start the firewall.
 #
 
-VERSION=1.3.8
+VERSION=1.3.9
 
 usage() # $1 = exit status
 {
@@ -493,7 +493,13 @@ if [ -z "$PREFIX" -a -n "$first_install" ]; then
     else
        modify_rclocal
     fi
+
+    echo \
+"########################################################################
+#      REMOVE THIS FILE AFTER YOU HAVE CONFIGURED SHOREWALL            #
+########################################################################" > /etc/shorewall/startup_disabled
 fi
+
 #
 #  Report Success
 #

Shorewall/shorewall.spec

@@ -1,5 +1,5 @@
 %define name shorewall
-%define version 1.3.8
+%define version 1.3.9
 %define release 1
 %define prefix /usr
 
@@ -40,10 +40,28 @@ export GROUP=`id -n -g` ;\
 rm -rf $RPM_BUILD_ROOT
 
 %post
-if [ -x /sbin/insserv ]; then /sbin/insserv /etc/rc.d/shorewall; elif [ -x /sbin/chkconfig ]; then /sbin/chkconfig --add shorewall;  fi
+
+if [ $1 -eq 1 ]; then
+    echo \
+"########################################################################
+#      REMOVE THIS FILE AFTER YOU HAVE CONFIGURED SHOREWALL            #
+########################################################################" > /etc/shorewall/startup_disabled
+fi
+
+if [ -x /sbin/insserv ]; then 
+	/sbin/insserv /etc/rc.d/shorewall
+elif [ -x /sbin/chkconfig ]; then
+	/sbin/chkconfig --add shorewall; 
+fi
 
 %preun
-if [ $1 = 0 ]; then if [ -x /sbin/insserv ]; then /sbin/insserv -r /etc/init.d/shorewall ; elif [ -x /sbin/chkconfig ]; then /sbin/chkconfig --del shorewall; fi ; fi
+if [ $1 = 0 ]; then
+	if [ -x /sbin/insserv ]; then
+		/sbin/insserv -r /etc/init.d/shorewall
+	elif [ -x /sbin/chkconfig ]; then
+		/sbin/chkconfig --del shorewall
+	fi
+fi
 
 %files 
 /etc/init.d/shorewall
@@ -76,6 +94,8 @@ if [ $1 = 0 ]; then if [ -x /sbin/insserv ]; then /sbin/insserv -r /etc/init.d/s
 %doc COPYING INSTALL changelog.txt releasenotes.txt tunnel
 
 %changelog
+* Thu Sep 18 2002 Tom Eastep <tom@shorewall.net>
+- Changed version to 1.3.8
 * Mon Sep 16 2002 Tom Eastep <tom@shorewall.net>
 - Changed version to 1.3.8
 * Mon Sep 02 2002 Tom Eastep <tom@shorewall.net>

Shorewall/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=1.3.8
+VERSION=1.3.9
 
 usage() # $1 = exit status
 {