holm/shorewall_code
1
0
Fork 0
forked from extern/shorewall_code
Code Pull Requests Activity

Avoid a shell warning when brctl is not installed.

Browse Source 
Signed-off-by: Tom Eastep <teastep@shorewall.net>
This commit is contained in:
Tom Eastep 2010-03-27 07:33:40 -07:00
parent f30cd7e287
commit 1153ff0c75
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -98,6 +98,7 @@ our %EXPORT_TAGS = ( internal => [ qw( create_temp_script
pop_open pop_open
read_a_line read_a_line
validate_level validate_level
which
qt qt
ensure_config_path ensure_config_path
get_configuration get_configuration
@ -129,7 +130,7 @@ our %EXPORT_TAGS = ( internal => [ qw( create_temp_script
Exporter::export_ok_tags('internal'); Exporter::export_ok_tags('internal');
our $VERSION = '4.4_8'; our $VERSION = '4.4_9';
# #
# describe the current command, it's present progressive, and it's completion. # describe the current command, it's present progressive, and it's completion.

2
Shorewall/Perl/Shorewall/Zones.pm
View File

@ -731,7 +731,7 @@ sub firewall_zone() {
# Determine if the passed physical device is a bridge # Determine if the passed physical device is a bridge
# #
sub is_a_bridge( $ ) { sub is_a_bridge( $ ) {
qt( "brctl show | tail -n+2 | grep -q '^$_[0]\[\[:space:\]\]'" ); which 'brctl' && qt( "brctl show | tail -n+2 | grep -q '^$_[0]\[\[:space:\]\]'" );
} }
# #