Remove -f as the default startup option via init

git-svn-id: https://shorewall.svn.sourceforge.net/svnroot/shorewall/trunk@6798 fbd18981-670d-0410-9b5c-8dc0c1a9a2bb
This commit is contained in:
teastep 2007-07-06 17:47:29 +00:00
parent b331a2432f
commit ef3efba72f
3 changed files with 23 additions and 3 deletions

View File

@ -2,6 +2,8 @@ Changes in 4.0.0 RC 2
1) Fix zone type check in Tunnels File. 1) Fix zone type check in Tunnels File.
2) Remove -f as default start OPTIONS.
Changes in 4.0.0 RC 1 Changes in 4.0.0 RC 1
1) shorewall-perl RPM no longer installable under shorewall 3.4. 1) shorewall-perl RPM no longer installable under shorewall 3.4.

View File

@ -60,7 +60,7 @@ usage() {
################################################################################ ################################################################################
# Get startup options (override default) # Get startup options (override default)
################################################################################ ################################################################################
OPTIONS="-f" OPTIONS=
if [ -f /etc/sysconfig/shorewall ]; then if [ -f /etc/sysconfig/shorewall ]; then
. /etc/sysconfig/shorewall . /etc/sysconfig/shorewall
elif [ -f /etc/default/shorewall ] ; then elif [ -f /etc/default/shorewall ] ; then

View File

@ -32,7 +32,11 @@ Problems corrected in 4.0.0 RC 2.
Other changes in Shorewall 4.0.0 RC 2. Other changes in Shorewall 4.0.0 RC 2.
None. 2) The -f option is no longer the default when Shorewall is started at
boot time (usually via /etc/init.d/shorewall). With Shorewall-perl,
"shorewall start" is nearly as fast as "shorewall restore" and
"shorewall start" uses the current configuration which avoids
confusion.
Migration Considerations: Migration Considerations:
@ -115,6 +119,21 @@ Migration Considerations:
empty causes Shorewall to leave the flags in /proc as they are. You empty causes Shorewall to leave the flags in /proc as they are. You
must set the option to 'No' in order to obtain the old behavior. must set the option to 'No' in order to obtain the old behavior.
3) The -f option is no longer the default when Shorewall is started at
boot time (usually via /etc/init.d/shorewall). With Shorewall-perl,
"shorewall start" is nearly as fast as "shorewall restore" and
"shorewall start" uses the current configuration which avoids
confusion.
If you plan on continuing to use Shorewall-shell and you want to
use the "-f" option at boot time, then you must add the following
to /etc/sysconfig/shorewall or /etc/default/shorewall:
OPTIONS="-f"
If you currently have neither of those files, you will need to
create one of them.
---------------------------------------------------------------------------- ----------------------------------------------------------------------------
N E W F E A T U R E S N E W F E A T U R E S
---------------------------------------------------------------------------- ----------------------------------------------------------------------------
@ -799,4 +818,3 @@ exported. Since the params file is processed before shorewall.conf,
using -a insures that the settings of your params variables are using -a insures that the settings of your params variables are
available to the new compiler should its use be specified in available to the new compiler should its use be specified in
shorewall.conf. shorewall.conf.