From c9030d977cd40695293c7af2b18f79ce48c1ad1f Mon Sep 17 00:00:00 2001 From: Pablo Ruiz Garcia Date: Wed, 12 Feb 2014 08:55:30 +0100 Subject: [PATCH] Delayed vlan interface creation until all checks are done. Signed-off-by: Pablo Ruiz Garcia --- data/PVE/Network.pm | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/data/PVE/Network.pm b/data/PVE/Network.pm index dc7ee86..ce06a96 100644 --- a/data/PVE/Network.pm +++ b/data/PVE/Network.pm @@ -165,6 +165,14 @@ sub activate_bridge_vlan { my $bridgevlan = "${bridge}v$tag"; + my @ifaces = (); + my $dir = "/sys/class/net/$bridge/brif"; + PVE::Tools::dir_glob_foreach($dir, '((eth|bond)\d+)', sub { + push(@ifaces, $_[0]); + }); + + die "no physical interface on bridge '$bridge'\n" if $ifcount == 0; + # add bridgevlan if it doesn't already exist if (! -d "/sys/class/net/$bridgevlan") { system("/sbin/brctl addbr $bridgevlan") == 0 || @@ -172,15 +180,9 @@ sub activate_bridge_vlan { } # for each physical interface (eth or bridge) bind them to bridge vlan - my $ifcount = 0; - my $dir = "/sys/class/net/$bridge/brif"; - PVE::Tools::dir_glob_foreach($dir, '((eth|bond)\d+)', sub { - my ($slave) = @_; - activate_bridge_vlan_slave($bridgevlan, $slave, $tag); - $ifcount++; - }); - - die "no physical interface on bridge '$bridge'\n" if $ifcount == 0; + foreach my $iface (@ifaces) { + activate_bridge_vlan_slave($bridgevlan, $iface, $tag); + } #fixme: set other bridge flags -- 2.39.2