From 000cc6978af185a7f28eeb5420f3e5204fc358a5 Mon Sep 17 00:00:00 2001 From: Tom Eastep Date: Tue, 3 Jul 2012 08:06:30 -0700 Subject: [PATCH] Add missing 'sleep' when waiting for wildcard interface to come up - Also reverse the order of test and sleep when waiting for a regular interface to come up. Signed-off-by: Tom Eastep --- Shorewall/Perl/Shorewall/Zones.pm | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/Shorewall/Perl/Shorewall/Zones.pm b/Shorewall/Perl/Shorewall/Zones.pm index 9aed46a21..abaa8cadb 100644 --- a/Shorewall/Perl/Shorewall/Zones.pm +++ b/Shorewall/Perl/Shorewall/Zones.pm @@ -1622,16 +1622,16 @@ sub verify_required_interfaces( $ ) { my $physical = get_physical $interface; if ( $physical =~ /\+$/ ) { - my $base = uc chain_base $physical; - $physical =~ s/\+$/*/; - emit( 'for interface in $(find_all_interfaces); do', + emit( "waittime=$wait", + '', + 'for interface in $(find_all_interfaces); do', ' case $interface in', " $physical)", - " waittime=$wait", ' while [ $waittime -gt 0 ]; do', ' interface_is_usable $interface && break', + ' sleep 1', ' waittime=$(($waittime - 1))', ' done', ' ;;', @@ -1644,8 +1644,8 @@ sub verify_required_interfaces( $ ) { emit qq( waittime=$wait); emit ''; emit q( while [ $waittime -gt 0 ]; do); - emit qq( interface_is_usable $physical && break); emit q( sleep 1); + emit qq( interface_is_usable $physical && break); emit ' waittime=$(($waittime - 1))'; emit q( done); emit q(fi);