remove $interfaces arg from generate_network_config

[pve-network.git] / PVE / Network / VlanPlugin.pm

diff --git a/PVE/Network/VlanPlugin.pm b/PVE/Network/VlanPlugin.pm
index 0bd43fe72742a05fcfe9fa475b66d06eb8a6da9e..a349890eba547943c2204b65fe33989ff2042825 100644 (file)
--- a/PVE/Network/VlanPlugin.pm
+++ b/PVE/Network/VlanPlugin.pm
@@ -52,7 +52,7 @@ sub options {
 
 # Plugin implementation
 sub generate_network_config {
-    my ($class, $plugin_config, $zoneid, $vnetid, $vnet, $interfaces, $uplinks) = @_;
+    my ($class, $plugin_config, $zoneid, $vnetid, $vnet, $uplinks) = @_;
 
     my $tag = $vnet->{tag};
     my $mtu = $vnet->{mtu};
@@ -74,16 +74,18 @@ sub generate_network_config {
     my $iface = $uplinks->{$uplink};
     $iface .= ".$tag";
 
-    die "interface $iface already exist in main configuration" if ($interfaces->{iface}->{$iface});
-    
     my $config = "\n";
+    $config .= "auto $iface\n";
+    $config .= "iface $iface inet manual\n";
+    $config .= "        vlan-protocol $vlanprotocol\n" if $vlanprotocol;
+    $config .= "        mtu $mtu\n" if $mtu;
+    $config .= "\n";
     $config .= "auto $vnetid\n";
     $config .= "iface $vnetid inet manual\n";
     $config .= "        bridge_ports $iface\n";
     $config .= "        bridge_stp off\n";
     $config .= "        bridge_fd 0\n";
     $config .= "        vlan-aware 1 \n" if $vlanaware;
-    $config .= "        vlan-protocol $vlanprotocol \n" if $vlanprotocol;
     $config .= "        mtu $mtu\n" if $mtu;
 
     return $config;