public inbox for pve-devel@lists.proxmox.com
 help / color / mirror / Atom feed
From: Thomas Lamprecht <t.lamprecht@proxmox.com>
To: pve-devel@lists.proxmox.com
Subject: [pve-devel] applied: [PATCH container] vzdump: fix passing mountpoints for the PBS case
Date: Thu,  9 Jul 2020 18:15:58 +0200	[thread overview]
Message-ID: <20200709161558.487647-1-t.lamprecht@proxmox.com> (raw)

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 <t.lamprecht@proxmox.com>
---
 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





                 reply	other threads:[~2020-07-09 16:16 UTC|newest]

Thread overview: [no followups] expand[flat|nested]  mbox.gz  Atom feed

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20200709161558.487647-1-t.lamprecht@proxmox.com \
    --to=t.lamprecht@proxmox.com \
    --cc=pve-devel@lists.proxmox.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
Service provided by Proxmox Server Solutions GmbH | Privacy | Legal