[pve-devel] [PATCH 2/7] improve saving config for vzdump

[Wolfgang Link]

this is necessary because we use snapshots and some (zfs) are read only.
---
 src/PVE/VZDump/LXC.pm | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/PVE/VZDump/LXC.pm b/src/PVE/VZDump/LXC.pm
index 24f81ef..32a85db 100644
--- a/src/PVE/VZDump/LXC.pm
+++ b/src/PVE/VZDump/LXC.pm
@@ -233,13 +233,13 @@ sub assemble {
 
     $task->{cleanup}->{etc_vzdump} = 1;
 
-    mkpath "$dir/etc/vzdump/";
+    mkpath "$dir/../etc/vzdump/";
 
     my $conf = PVE::LXC::load_config($vmid);
     delete $conf->{snapshots};
     delete $conf->{'pve.parent'};
 
-    PVE::Tools::file_set_contents("$dir/etc/vzdump/pct.conf", PVE::LXC::write_pct_config("/lxc/$vmid.conf", $conf));
+    PVE::Tools::file_set_contents("$dir/../etc/vzdump/pct.conf", PVE::LXC::write_pct_config("/lxc/$vmid.conf", $conf));
 }
 
 sub archive {
@@ -265,7 +265,7 @@ sub archive {
     my $cmd = "(";
 
     $cmd .= "cd $snapdir;find . $findargs|sed 's/\\\\/\\\\\\\\/g'|";
-    $cmd .= "tar cpf - $taropts ./etc/vzdump/pct.conf --null -T -";
+    $cmd .= "tar cpf - $taropts ../etc/vzdump/pct.conf --null -T -";
     my $bwl = $opts->{bwlimit}*1024; # bandwidth limit for cstream
     $cmd .= "|cstream -t $bwl" if $opts->{bwlimit};
     $cmd .= "|$comp" if $comp;
@@ -299,7 +299,7 @@ sub cleanup {
     }
     
     if ($task->{cleanup}->{etc_vzdump}) {
-	my $dir = "$task->{snapdir}/etc/vzdump";
+	my $dir = "$task->{snapdir}/../etc/";
 	eval { rmtree $dir if -d $dir; };
 	$self->logerr ($@) if $@;
     }
-- 
2.1.4