Rename shorewall.conf->shorewall-lite.conf -- phase II

git-svn-id: https://shorewall.svn.sourceforge.net/svnroot/shorewall/trunk@5188 fbd18981-670d-0410-9b5c-8dc0c1a9a2bb
This commit is contained in:
teastep 2007-01-02 21:25:35 +00:00
parent 6984f59cee
commit f6800555b6
4 changed files with 22 additions and 4 deletions

View File

@ -537,6 +537,8 @@ ensure_config_path
config=$(find_file shorewall.conf)
[ -f $config ] || config=$(find_file shorewall-lite.conf)
if [ -f $config ]; then
if [ -r $config ]; then
. $config

View File

@ -1,6 +1,8 @@
###############################################################################
# /etc/shorewall-lite/shorewall.conf V3.4 - Change the following variables to
# match your setup
# /etc/shorewall-lite/shorewall-lite.conf V3.4 - Change the following
# variables to override the values in the shorewall.conf file used to
# compile /var/lib/shorewall-lite/firewall. Those values may be found in
# /var/lib/shorewall-lite/firewall.conf.
#
# This program is under GPL [http://www.gnu.org/copyleft/gpl.htm]
#

View File

@ -7,7 +7,7 @@ Changes in 3.4.0 Beta 2
3) Add wait4ifup.
4) Rename the shorewall.conf(5) manpage in Shorewall Lite.
4) Rename the shorewall.conf to shorewall-lite.conf.
Changes in 3.4.0 Beta 1

View File

@ -43,7 +43,10 @@ Problems Corrected in 3.4.0 Beta 2
3) To allow Shorewall and Shorewall Lite to coexist on a single
system, the Shorewall section 5 manpages are no longer included in
Shorewall Lite. In addition, the Shorewall Lite manpage for
"shorewall.conf" has been renamed "shorewall-lite.conf".
"shorewall.conf" has been renamed "shorewall-lite.conf". This
has resulted in a similar change to the actual file --
/etc/shorewall-lite/shorewall.conf has been renamed
/etc/shorewall-lite/shorewall-lite.conf.
Migration Considerations:
@ -111,6 +114,17 @@ Migration Considerations:
do exist, remove them.
b) Either restart networking or reboot.
4) This issue only applies if you run Shorewall Lite.
The /etc/shorewall-lite/shorewall.conf file has been renamed
/etc/shorewall-lite/shorewall-lite.conf. If you use the
tarball to install, your shorewall.conf file will be
retained and Shorewall Lite will continue to use it.
If you use an RPM and you have modified the existing
/etc/shorewall/shorewall.conf, make a copy of the file
so that you can restore the changes once you have upgraded.
New Features in Shorewall 3.4:
1) In order to accomodate small embedded applications, Shorewall 3.4