extern/shorewall_code
1
0
Fork 1
mirror of https://gitlab.com/shorewall/code.git synced 2024-11-15 04:04:10 +01:00
Code Issues Packages Projects Releases Wiki Activity

Add progess and warning messages to 'update -D'

Browse Source 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
This commit is contained in:
Tom Eastep 2013-05-25 16:31:55 -07:00
parent dde1f0a779
commit 31f9ea5b93
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
Shorewall/Perl/Shorewall/Config.pm
View File

@ -4435,8 +4435,8 @@ sub conditional_quote( $ ) {
# #
# Update the shorewall[6].conf file. Save the current file with a .bak suffix. # Update the shorewall[6].conf file. Save the current file with a .bak suffix.
# #
sub update_config_file( $ ) { sub update_config_file( $$ ) {
my $annotate = shift; my ( $annotate, $directives ) = @_;
sub is_set( $ ) { sub is_set( $ ) {
my $value = $_[0]; my $value = $_[0];
@ -4554,7 +4554,7 @@ EOF
progress_message3 "No update required to configuration file $configfile"; progress_message3 "No update required to configuration file $configfile";
} }
exit 0 unless -f find_file 'blacklist'; exit 0 unless $directives || -f find_file 'blacklist';
} }
} else { } else {
fatal_error "$fn does not exist"; fatal_error "$fn does not exist";
@ -4564,8 +4564,8 @@ EOF
# #
# Small functions called by get_configuration. We separate them so profiling is more useful # Small functions called by get_configuration. We separate them so profiling is more useful
# #
sub process_shorewall_conf( $$ ) { sub process_shorewall_conf( $$$ ) {
my ( $update, $annotate ) = @_; my ( $update, $annotate, $directives ) = @_;
my $file = find_file "$product.conf"; my $file = find_file "$product.conf";
if ( -f $file ) { if ( -f $file ) {
@ -4610,7 +4610,7 @@ sub process_shorewall_conf( $$ ) {
# #
# Now update the config file if asked # Now update the config file if asked
# #
update_config_file( $annotate) if $update; update_config_file( $annotate, $directives ) if $update;
# #
# Config file update requires that the option values not have # Config file update requires that the option values not have
# Shell variables expanded. We do that now. # Shell variables expanded. We do that now.
@ -5011,7 +5011,7 @@ sub get_configuration( $$$$ ) {
get_params; get_params;
process_shorewall_conf( $update, $annotate ); process_shorewall_conf( $update, $annotate, $directives );
ensure_config_path; ensure_config_path;