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)) (No client certificate requested) by lists.proxmox.com (Postfix) with ESMTPS id DD07770592 for ; Fri, 2 Apr 2021 14:36:39 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id D2DDAEC89 for ; Fri, 2 Apr 2021 14:36:39 +0200 (CEST) Received: from proxmox-new.maurer-it.com (proxmox-new.maurer-it.com [212.186.127.180]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by firstgate.proxmox.com (Proxmox) with ESMTPS id 6508AEC81 for ; Fri, 2 Apr 2021 14:36:39 +0200 (CEST) Received: from proxmox-new.maurer-it.com (localhost.localdomain [127.0.0.1]) by proxmox-new.maurer-it.com (Proxmox) with ESMTP id 28D1943624 for ; Fri, 2 Apr 2021 14:36:39 +0200 (CEST) From: Fabian Ebner To: pve-devel@lists.proxmox.com Date: Fri, 2 Apr 2021 14:36:36 +0200 Message-Id: <20210402123636.27037-1-f.ebner@proxmox.com> X-Mailer: git-send-email 2.20.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.007 Adjusted score from AWL reputation of From: address KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment RCVD_IN_DNSWL_MED -2.3 Sender listed at https://www.dnswl.org/, medium trust SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_PASS -0.001 SPF: sender matches 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. [lxc.pm] Subject: [pve-devel] [PATCH container] fix #3367: skip bind mounts when converting to template 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: Fri, 02 Apr 2021 12:36:39 -0000 Restoring a backup of a template with a bind mount point failed, because the volume_has_feature check would fail. Fix this by skipping bind mounts on template creation. There is no check against adding a bind mount with 'pct set' *after* converting to a template, so it shouldn't be an issue if we also allow conversion if bind mounts are present *at* conversion time. Signed-off-by: Fabian Ebner --- src/PVE/LXC.pm | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/PVE/LXC.pm b/src/PVE/LXC.pm index 6395d12..5a9f76d 100644 --- a/src/PVE/LXC.pm +++ b/src/PVE/LXC.pm @@ -1186,6 +1186,8 @@ sub template_create { PVE::LXC::Config->foreach_volume($conf, sub { my ($ms, $mountpoint) = @_; + return if $mountpoint->{type} eq 'bind'; + my $volid = $mountpoint->{volume}; die "Template feature is not available for '$volid'\n" @@ -1195,6 +1197,8 @@ sub template_create { PVE::LXC::Config->foreach_volume($conf, sub { my ($ms, $mountpoint) = @_; + return if $mountpoint->{type} eq 'bind'; + my $volid = $mountpoint->{volume}; PVE::Storage::activate_volumes($storecfg, [$volid]); -- 2.20.1