From: Stefan Reiter Date: Mon, 28 Oct 2019 11:59:13 +0000 (+0100) Subject: tools: get_host_arch: return raw uname machine entry X-Git-Url: https://git.proxmox.com/?p=pve-common.git;a=commitdiff_plain;h=ce007e99ffc7fb5df563acb7505461010366ecb8 tools: get_host_arch: return raw uname machine entry The current version had only one user in LXC, so move the LXC-specific code there to reuse this in QemuServer. Also cache, since the host's architecture can't change during runtime. Signed-off-by: Stefan Reiter --- diff --git a/src/PVE/Tools.pm b/src/PVE/Tools.pm index 550da09..c9d37ec 100644 --- a/src/PVE/Tools.pm +++ b/src/PVE/Tools.pm @@ -47,6 +47,7 @@ safe_print trim extract_param file_copy +get_host_arch O_PATH O_TMPFILE ); @@ -1630,18 +1631,10 @@ sub readline_nointr { return $line; } -sub get_host_arch { - - my @uname = POSIX::uname(); - my $machine = $uname[4]; - - if ($machine eq 'x86_64') { - return 'amd64'; - } elsif ($machine eq 'aarch64') { - return 'arm64'; - } else { - die "unsupported host architecture '$machine'\n"; - } +my $host_arch; +sub get_host_arch() { + $host_arch = (POSIX::uname())[4] if !$host_arch; + return $host_arch; } # Devices are: [ (12 bits minor) (12 bits major) (8 bits minor) ]