diff --git a/Shorewall-common/changelog.txt b/Shorewall-common/changelog.txt index 4acb1645d..a558559f1 100644 --- a/Shorewall-common/changelog.txt +++ b/Shorewall-common/changelog.txt @@ -2,6 +2,8 @@ Changes in 4.2.0-Beta3 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 1) Only issue a warning on RFC 1918 violation. diff --git a/Shorewall-common/releasenotes.txt b/Shorewall-common/releasenotes.txt index 0e230a1c9..c3b757b18 100644 --- a/Shorewall-common/releasenotes.txt +++ b/Shorewall-common/releasenotes.txt @@ -88,7 +88,9 @@ Problems corrected in Shorewall-perl-4.2.0 Beta3. 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. diff --git a/Shorewall-lite/init.sh b/Shorewall-lite/init.sh index d67f5f1ac..60e53e5b7 100755 --- a/Shorewall-lite/init.sh +++ b/Shorewall-lite/init.sh @@ -60,7 +60,7 @@ usage() { ################################################################################ # Get startup options (override default) ################################################################################ -OPTIONS="-f" +OPTIONS= if [ -f /etc/sysconfig/shorewall ]; then . /etc/sysconfig/shorewall elif [ -f /etc/default/shorewall ] ; then