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 63022618D3 for ; Thu, 9 Jul 2020 18:16:35 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 555EA13FAE for ; Thu, 9 Jul 2020 18:16:05 +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 3A62A13FA4 for ; Thu, 9 Jul 2020 18:16:04 +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 097FE444AA for ; Thu, 9 Jul 2020 18:16:04 +0200 (CEST) From: Thomas Lamprecht To: pve-devel@lists.proxmox.com Date: Thu, 9 Jul 2020 18:15:58 +0200 Message-Id: <20200709161558.487647-1-t.lamprecht@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.000 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 Subject: [pve-devel] applied: [PATCH container] vzdump: fix passing mountpoints for the PBS case 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, 09 Jul 2020 16:16:35 -0000 The stop-mode case only worked by luck as then $snapdir == $rootdir. But for snapshots we rsync over a clean state to a separate directory, so this has to be used as base for the backup (just like tar does). Signed-off-by: Thomas Lamprecht --- src/PVE/VZDump/LXC.pm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/PVE/VZDump/LXC.pm b/src/PVE/VZDump/LXC.pm index 29e1982..5038d3a 100644 --- a/src/PVE/VZDump/LXC.pm +++ b/src/PVE/VZDump/LXC.pm @@ -364,7 +364,7 @@ sub archive { if ($self->{vzdump}->{opts}->{pbs}) { - my $rootdir = $default_mount_point; + my $rootdir = $snapdir; my $param = []; push @$param, "pct.conf:$tmpdir/etc/vzdump/pct.conf"; @@ -376,8 +376,8 @@ sub archive { push @$param, "root.pxar:$rootdir"; - foreach my $disk (@$disks) { - push @$param, '--include-dev', $disk->{dir}; + foreach my $disk (@sources) { + push @$param, '--include-dev', "$snapdir/$disk"; } push @$param, '--skip-lost-and-found' if $userns_cmd; -- 2.20.1