fix #1078: accept arch parameter

we now accept the arch parameter,
when value is valid according to the JSONSchema
and skip detection on creation/restoration when we
explicitly set one

Signed-off-by: Dominik Csapak <d.csapak@proxmox.com>

diff --git a/src/PVE/LXC/Config.pm b/src/PVE/LXC/Config.pm
index cfe952f2fe168c1816e08243316d2cac1204fc55..1efb178f237ec81c428317227082a478e80a3ef2 100644 (file)
--- a/src/PVE/LXC/Config.pm
+++ b/src/PVE/LXC/Config.pm
@@ -865,7 +865,7 @@ sub update_pct_config {
     foreach my $opt (keys %$param) {
        my $value = $param->{$opt};
        my $check_protection_msg = "can't update CT $vmid drive '$opt'";
-       if ($opt eq 'hostname') {
+       if ($opt eq 'hostname' || $opt eq 'arch') {
            $conf->{$opt} = $value;
        } elsif ($opt eq 'onboot') {
            $conf->{$opt} = $value ? 1 : 0;

diff --git a/src/PVE/LXC/Create.pm b/src/PVE/LXC/Create.pm
index 98a799fc9c0ad7de62e375047a1f19329416d576..aea6ad3acc728ef479bae1dbd6cdd3180664d8f4 100644 (file)
--- a/src/PVE/LXC/Create.pm
+++ b/src/PVE/LXC/Create.pm
@@ -49,7 +49,10 @@ sub restore_archive {
        eval { PVE::Tools::run_command($cmd); };
     }
     die $@ if $@ && !$no_unpack_error;
-    
+
+    # if arch is set, we do not try to autodetect it
+    return if defined($conf->{arch});
+
     # determine file type of /usr/bin/file itself to get guests' architecture
     $cmd = [@$userns_cmd, '/usr/bin/file', '-b', '-L', "$rootdir/bin/sh"];
     PVE::Tools::run_command($cmd, outfunc => sub {