diff --git a/Shorewall-core/lib.cli b/Shorewall-core/lib.cli index d378a43bb..87a6779c2 100644 --- a/Shorewall-core/lib.cli +++ b/Shorewall-core/lib.cli @@ -3421,8 +3421,16 @@ shorewall_cli() { g_fast=Yes option=${option#f} ;; - v*) - option=${option#v} + [vV]*) + case $option in + v*) + option=${option#v} + ;; + *) + option=${option#V} + ;; + esac + case $option in -1*) g_use_verbosity=-1 diff --git a/Shorewall/Perl/Shorewall/Providers.pm b/Shorewall/Perl/Shorewall/Providers.pm index 60e789a7f..0f14943db 100644 --- a/Shorewall/Perl/Shorewall/Providers.pm +++ b/Shorewall/Perl/Shorewall/Providers.pm @@ -1409,18 +1409,16 @@ sub process_providers( $ ) { } } - if ( $providers || $pseudoproviders ) { - my $fn = open_file 'routes'; + my $fn = open_file 'routes'; - if ( $fn ) { - first_entry "$doing $fn..."; - emit ''; - add_a_route while read_a_line( NORMAL_READ ); - } - - add_a_provider( $providers{$_}, $tcdevices ) for @providers; + if ( $fn ) { + first_entry "$doing $fn..."; + emit ''; + add_a_route while read_a_line( NORMAL_READ ); } + add_a_provider( $providers{$_}, $tcdevices ) for @providers; + emit << 'EOF';; #