extern/shorewall_code
1
0
Fork 1
mirror of https://gitlab.com/shorewall/code.git synced 2024-12-23 06:38:53 +01:00
Code Issues Packages Projects Releases Wiki Activity

Don't slow down stop with 'wait'

Browse Source
This commit is contained in:
Tom Eastep 2010-07-22 12:53:00 -07:00
parent 055f92c3d2
commit 666cc35b46
2 changed files with 18 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1287,7 +1287,15 @@ sub verify_required_interfaces( $ ) {
my $interfaces = find_interfaces_by_option 'wait'; my $interfaces = find_interfaces_by_option 'wait';
if ( @$interfaces ) { if ( @$interfaces ) {
emit "local waittime\n"; emit( "local waittime\n" );
emit( 'case "$COMMAND" in' );
push_indent;
emit( 'start|restart|restore)' );
push_indent;
for my $interface (@$interfaces ) { for my $interface (@$interfaces ) {
my $wait = $interfaces{$interface}{options}{wait}; my $wait = $interfaces{$interface}{options}{wait};
@ -1328,6 +1336,14 @@ sub verify_required_interfaces( $ ) {
$returnvalue = 1; $returnvalue = 1;
} }
} }
emit( ";;\n" );
pop_indent;
pop_indent;
emit( 'esac' );
} }
$interfaces = find_interfaces_by_option 'required'; $interfaces = find_interfaces_by_option 'required';

2
Shorewall/Perl/prog.header
View File

@ -697,7 +697,7 @@ startup_error() # $* = Error Message
;; ;;
esac esac
if [ $LOG_VERBOSITY -gt 1 ]; then if [ $LOG_VERBOSITY -ge 0 ]; then
timestamp="$(date +'%_b %d %T') " timestamp="$(date +'%_b %d %T') "
case $COMMAND in case $COMMAND in