From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [212.224.123.68]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by lists.proxmox.com (Postfix) with ESMTPS id 1B03160735 for ; Thu, 26 Nov 2020 10:18:57 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 0FB67D0B1 for ; Thu, 26 Nov 2020 10:18:57 +0100 (CET) Received: from kvmformation1.odiso.net (globalOdiso.M6Lille.odiso.net [89.248.211.242]) by firstgate.proxmox.com (Proxmox) with ESMTP id D7B7FD0A9 for ; Thu, 26 Nov 2020 10:18:55 +0100 (CET) Received: by kvmformation1.odiso.net (Postfix, from userid 0) id 675EA168418; Thu, 26 Nov 2020 10:18:48 +0100 (CET) From: Alexandre Derumier To: pve-devel@lists.proxmox.com Date: Thu, 26 Nov 2020 10:18:46 +0100 Message-Id: <20201126091846.371842-1-aderumier@odiso.com> X-Mailer: git-send-email 2.20.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 1 AWL -0.231 Adjusted score from AWL reputation of From: address HEADER_FROM_DIFFERENT_DOMAINS 0.249 From and EnvelopeFrom 2nd level mail domains are different KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment KAM_LAZY_DOMAIN_SECURITY 1 Sending domain does not have any anti-forgery methods KHOP_HELO_FCRDNS 0.4 Relay HELO differs from its IP's reverse DNS NO_DNS_FOR_FROM 0.379 Envelope sender has no MX or A DNS records SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_NONE 0.001 SPF: sender does not publish an SPF Record URIBL_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to URIBL was blocked. See http://wiki.apache.org/spamassassin/DnsBlocklists#dnsbl-block for more information. [inotify.pm] Subject: [pve-devel] [PATCH pve-common] Inotify: delete vlan-id for "iface.X" vlan iface. X-BeenThere: pve-devel@lists.proxmox.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Proxmox VE development discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 26 Nov 2020 09:18:57 -0000 Signed-off-by: Alexandre Derumier --- src/PVE/INotify.pm | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/PVE/INotify.pm b/src/PVE/INotify.pm index 676dcc6..54f4031 100644 --- a/src/PVE/INotify.pm +++ b/src/PVE/INotify.pm @@ -1557,6 +1557,8 @@ sub __write_etc_network_interfaces { $p = $1; $vlanid = $2; delete $d->{'vlan-raw-device'} if $d->{'vlan-raw-device'}; + delete $d->{'vlan-id'} if $d->{'vlan-id'}; + } else { die "missing vlan-raw-device option" if !$d->{'vlan-raw-device'}; $p = $d->{'vlan-raw-device'}; -- 2.20.1