restore: make sure only the first pct.conf is extracted

When making a stop/snapshot mode backup of a container that
was already restored from a backup, its /etc/vzdump/pct.conf
file was replacing our newly created one in the archive. We
need to prevent the duplicate file from overwriting our new
one.

diff --git a/src/PVE/LXC/Create.pm b/src/PVE/LXC/Create.pm
index 463af0bc772bca99930913f3f3ed7dafd4695d67..6c02648a48459159b77a64d28d63cb703a81d142 100644 (file)
--- a/src/PVE/LXC/Create.pm
+++ b/src/PVE/LXC/Create.pm
@@ -36,6 +36,11 @@ sub restore_archive {
     my $cmd = [@$userns_cmd, 'tar', 'xpf', $archive, '--numeric-owner', '--totals',
            '--sparse', '-C', $rootdir];
 
+    # skip-old-files doesn't have anything to do with time (old/new), but is
+    # simply -k (annoyingly also called --keep-old-files) without the 'treat
+    # existing files as errors' part... iow. it's bsdtar's interpretation of -k
+    # *sigh*, gnu...
+    push @$cmd, '--skip-old-files';
     push @$cmd, '--anchored';
     push @$cmd, '--exclude' , './dev/*';