holm/shorewall_code
1
0
Fork 0
forked from extern/shorewall_code
Code Pull Requests Activity

Don't assume -f in /etc/init.d/shorewall-lite

Browse Source 
git-svn-id: https://shorewall.svn.sourceforge.net/svnroot/shorewall/trunk@8595 fbd18981-670d-0410-9b5c-8dc0c1a9a2bb
This commit is contained in:
teastep 2008-06-30 14:38:29 +00:00
parent b44ee8212d
commit 04e6d01503
3 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Shorewall-common/changelog.txt
View File

@ -2,6 +2,8 @@ Changes in 4.2.0-Beta3
1) Fix ip_forwarding vs the 'restore' command. 1) Fix ip_forwarding vs the 'restore' command.
2) Don't assume -f in /etc/init.d/shorewall-lite
Changes in 4.2.0-Beta2 Changes in 4.2.0-Beta2
1) Only issue a warning on RFC 1918 violation. 1) Only issue a warning on RFC 1918 violation.

4
Shorewall-common/releasenotes.txt
View File

@ -88,7 +88,9 @@ Problems corrected in Shorewall-perl-4.2.0 Beta3.
Other Changes in Shoreall 4.2.0 Beta 3. Other Changes in Shoreall 4.2.0 Beta 3.
None. 1) Beginning with Shorewall 4.0.0, the -f option was no longer the
default for '/etc/init.d/shorewall start'. Beginning with 4.0.13
and 4.2.0-Beta3, this is also true for Shoreawall-lite.
New Features in Shorewall 4.2. New Features in Shorewall 4.2.

2
Shorewall-lite/init.sh
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