From: Alexandre Derumier <aderumier@odiso.com>
Date: Thu, 28 Mar 2019 23:23:50 +0000 (+0100)
Subject: vlanplugin: define vlan interface and fix vlan-protocol
X-Git-Url: https://git.puffer.fish/?a=commitdiff_plain;h=f93d43e8a2aaee1cec10b27932de33ded2be24c5;p=matthieu%2Fpve-network.git

vlanplugin: define vlan interface and fix vlan-protocol

vlan-protocol is on vlan interface, better to always define it

Signed-off-by: Alexandre Derumier <aderumier@odiso.com>
---

diff --git a/PVE/Network/VlanPlugin.pm b/PVE/Network/VlanPlugin.pm
index 0bd43fe..cbeecf6 100644
--- a/PVE/Network/VlanPlugin.pm
+++ b/PVE/Network/VlanPlugin.pm
@@ -77,13 +77,17 @@ sub generate_network_config {
     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;