Fix for unexpected /usr/share/shorewall/init

Signed-off-by: Tom Eastep <teastep@shorewall.net>
This commit is contained in:
Tom Eastep 2010-11-11 13:03:00 -08:00
parent a1e3683651
commit 775bee278a
3 changed files with 15 additions and 1 deletions

View File

@ -3322,7 +3322,7 @@ sub append_file( $;$$ ) {
$indent = '' if $unindented;
unless ( $user_exit =~ /^($globals{SHAREDIR})/ ) {
unless ( $user_exit =~ /^($globals{SHAREDIRPL})/ ) { #Don't copy from /usr/share/shorewall*
if ( -f $user_exit ) {
if ( $nomsg ) {
#

View File

@ -6,6 +6,8 @@ Changes in Shorewall 4.4.15
3) Fix NULL_ROUTE_RFC1918
4) Fix problem of appending incorrect files.
Changes in Shorewall 4.4.14
1) Support ipset lists.

View File

@ -22,6 +22,18 @@ VI. PROBLEMS CORRECTED AND NEW FEATURES IN PRIOR RELEASES
NULL_ROUTE_RFC1918=Yes would cause the route to be replaced with an
'unreachable' one.
3) Shorewall6 failed to start correctly if all the following were true:
- Shorewall was installed using the tarball. It may have
subsequently been installed using a distribution-specific package
or the rpm from shorewall.net without first unstalling the
tarball components.
- Shorewall6 was installed using a distribution-specific package or
the rpm from shorewall.net.
- The file /etc/shorewall6/init was not created.
----------------------------------------------------------------------------
I I. K N O W N P R O B L E M S R E M A I N I N G
----------------------------------------------------------------------------