skip some additional config options when restoring

-unusedX in all cases, even when creating
-parent when merging config from backup

diff --git a/src/PVE/API2/LXC.pm b/src/PVE/API2/LXC.pm
index 90cdba6212f01a58491e89450a6b38aea2383f6c..03c20fae1e8735cd0e9d0edab0b8f62abde0492b 100644 (file)
--- a/src/PVE/API2/LXC.pm
+++ b/src/PVE/API2/LXC.pm
@@ -261,6 +261,9 @@ __PACKAGE__->register_method({
            if ($opt eq 'rootfs' || $opt =~ m/^mp\d+$/) {
                # allow to use simple numbers (add default storage in that case)
                $param->{$opt} = "$storage:$value" if $value =~ m/^\d+(\.\d+)?$/;
+           } elsif ($opt =~ m/^unused\d+$/) {
+               warn "ignoring '$opt', cannot create/restore with unused volume\n";
+               delete $param->{$opt};
            } else {
                $no_disk_param->{$opt} = $value;
            }

diff --git a/src/PVE/LXC/Create.pm b/src/PVE/LXC/Create.pm
index 6c47ceb784be0c824dba835226373a1fbec192ff..9375f43948531af0e8fc6b83b7d618eb0f698040 100644 (file)
--- a/src/PVE/LXC/Create.pm
+++ b/src/PVE/LXC/Create.pm
@@ -154,8 +154,9 @@ sub restore_and_configure {
            my $oldconf = PVE::LXC::Config::parse_pct_config("/lxc/$vmid.conf", $raw);
 
            foreach my $key (keys %$oldconf) {
-               next if $key eq 'digest' || $key eq 'rootfs' || $key eq 'snapshots' || $key eq 'unprivileged';
+               next if $key eq 'digest' || $key eq 'rootfs' || $key eq 'snapshots' || $key eq 'unprivileged' || $key eq 'parent';
                next if $key =~ /^mp\d+$/; # don't recover mountpoints
+               next if $key =~ /^unused\d+$/; # don't recover unused disks
                $conf->{$key} = $oldconf->{$key} if !defined($conf->{$key});
            }
            unlink($pct_cfg_fn);