From: Pablo Ruiz Garcia <pablo.ruiz@gmail.com>
Date: Wed, 12 Feb 2014 07:55:29 +0000 (+0100)
Subject: Handle cases where the vlan bridge has already been setup previouslly.
X-Git-Url: https://git.proxmox.com/?p=pve-common.git;a=commitdiff_plain;h=eee4b32a6528a56f1028e9a622bb14a998d6e6e5

Handle cases where the vlan bridge has already been setup previouslly.

Signed-off-by: Pablo Ruiz Garcia <pablo.ruiz@gmail.com>
---

diff --git a/data/PVE/Network.pm b/data/PVE/Network.pm
index 73984c2..dc7ee86 100644
--- a/data/PVE/Network.pm
+++ b/data/PVE/Network.pm
@@ -141,6 +141,9 @@ sub activate_bridge_vlan_slave {
         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;
 	}
     }