Make 'compile' output distribution-neutral

git-svn-id: https://shorewall.svn.sourceforge.net/svnroot/shorewall/trunk@3641 fbd18981-670d-0410-9b5c-8dc0c1a9a2bb
This commit is contained in:
teastep 2006-03-09 22:55:28 +00:00
parent 98ae15659f
commit 714b3c39e3
4 changed files with 6 additions and 38 deletions

View File

@ -117,3 +117,5 @@ Changes in 3.1.x.
49) Process /etc/shorewall/params at run-time.
50) Add new modules to /etc/shorewall/modules.
51) Make default behavior of "compile" distribution-neutral.

View File

@ -62,7 +62,6 @@ case "$COMMAND" in
progress_message3 "Starting Shorewall...."
define_firewall
status=$?
[ $status = 0 -a -n "$SUBSYSLOCK" ] && touch $SUBSYSLOCK
progress_message3 "done."
fi
;;
@ -70,7 +69,6 @@ case "$COMMAND" in
progress_message3 "Stopping Shorewall...."
stop_firewall
status=0
[ -n "$SUBSYSLOCK" ] && rm -f $SUBSYSLOCK
progress_message3 "done."
;;
restart)
@ -88,7 +86,6 @@ case "$COMMAND" in
restore)
restore_firewall
status=$?
[ $status = 0 -a -n "$SUBSYSLOCK" ] && touch $SUBSYSLOCK
;;
clear)
progress_message3 "Clearing Shorewall...."

View File

@ -1,5 +1,4 @@
#!/bin/sh
RCDLINKS="2,S41 3,S41 6,K41"
#
# Generated by the Shoreline Firewall (Shorewall) Packet Filtering Firewall - V3.2
#
@ -7,27 +6,6 @@ RCDLINKS="2,S41 3,S41 6,K41"
#
# (c) 2006 - Tom Eastep (teastep@shorewall.net)
#
# On most distributions, this file should be called /etc/init.d/firewall.
#
# Complete documentation is available at http://shorewall.net
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of Version 2 of the GNU General Public License
# as published by the Free Software Foundation.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA
#
# If an error occurs while starting or restarting the firewall, the
# firewall is automatically restored if there is a current
# restore file (created by "shorewall save"). If there is no restore
# file, the firewall is stopped.
#
# Options are:
#
@ -45,15 +23,3 @@ RCDLINKS="2,S41 3,S41 6,K41"
# version Displays the version of Shorewall that
# generated this program
#
# chkconfig: 2345 25 90
# description: Packet filtering firewall
### BEGIN INIT INFO
# Provides: firewall
# Required-Start: $network
# Required-Stop:
# Default-Start: 2 3 5
# Default-Stop: 0 1 6
# Description: starts and stops the shorewall-generated firewall
### END INIT INFO

View File

@ -39,7 +39,10 @@ Problems Corrected in 3.2.0 Beta 1
Other changes in 3.2.0 Beta 1
None.
1) By default, the program generated by the "shorewall compile" command
cannot be installed into /etc/init.d/ unless the "-d <distro>" option
is given. This will make the default behavior distribution-neutral
which is what it should be.
Migration Considerations: