my $tbridge = basename(readlink($path));
if ($tbridge ne $bridgevlan) {
die "interface $ifacevlan already exist in bridge $tbridge\n";
+ } else {
+ # Port already attached to bridge: do nothing.
+ return;
}
}
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 scalar(@ifaces) == 0;
+
# add bridgevlan if it doesn't already exist
if (! -d "/sys/class/net/$bridgevlan") {
system("/sbin/brctl addbr $bridgevlan") == 0 ||
}
# 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