From 672ad567d30d1d9232d7b3bd5050c6c8168e0475 Mon Sep 17 00:00:00 2001
From: Thierry Parmentelat <thierry.parmentelat@inria.fr>
Date: Sun, 22 Oct 2023 14:38:58 +0200
Subject: [PATCH] get the arch string - i.e. x86_64 or i386 - using arch, as
 uname -i now returns 'unknown'

---
 Makefile         | 2 +-
 build.common     | 2 +-
 lbuild-initvm.sh | 6 +++---
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/Makefile b/Makefile
index f2c16029..849530d6 100644
--- a/Makefile
+++ b/Makefile
@@ -116,7 +116,7 @@ PLANETLAB_RELEASE = 5.2
 # Default values
 #
 # minimal compat with macos, just so this does not complain
-HOSTARCH := $(shell uname -i 2> /dev/null || uname -m 2> /dev/null)
+HOSTARCH := $(shell arch)
 DISTRO := $(shell ./getdistro.sh)
 RELEASE := $(shell ./getrelease.sh)
 DISTRONAME := $(shell ./getdistroname.sh)
diff --git a/build.common b/build.common
index e34434c1..9d59dcb9 100644
--- a/build.common
+++ b/build.common
@@ -108,7 +108,7 @@ pl_DISTRO=$(pl_getDistro)
 
 # select basearch of the host devel environment - protected for macos for local tests
 # try arch for testing stuff on a mac
-pl_DISTRO_ARCH=$(uname -i 2>/dev/null || arch 2> /dev/null || echo unknownarch)
+pl_DISTRO_ARCH=$(arch 2> /dev/null || echo unknownarch)
 
 # the release number (plain number)
 pl_DISTRO_RELEASE=$(pl_getRelease)
diff --git a/lbuild-initvm.sh b/lbuild-initvm.sh
index 1f0e718f..14cb3250 100755
--- a/lbuild-initvm.sh
+++ b/lbuild-initvm.sh
@@ -731,9 +731,9 @@ function devel_or_test_tools () {
     local pkgsfile=$(pl_locateDistroFile $DIRNAME $pldistro $PREINSTALLED)
 
     ### install individual packages, then groups
-    # get target arch - use uname -i here (we want either x86_64 or i386)
+    # get target arch - (we want either x86_64 or i386)
 
-    local lxc_arch=$(chroot ${lxc_root} $personality uname -i)
+    local lxc_arch=$(chroot ${lxc_root} $personality arch)
     # on debian systems we get arch through the 'arch' command
     [ "$lxc_arch" = "unknown" ] && lxc_arch=$(chroot ${lxc_root} $personality arch)
 
@@ -899,7 +899,7 @@ function wait_for_ssh () {
     while [ "$current_time" -lt "$stop_time" ] ; do
         echo "$counter-th attempt to reach sshd in container $lxc ..."
         [ -z "$guest_ip" ] && guest_ip=$(guest_ipv4 $lxc)
-        [ -n "$guest_ip" ] && ssh -o "StrictHostKeyChecking no" $guest_ip 'uname -i' && {
+        [ -n "$guest_ip" ] && ssh -o "StrictHostKeyChecking no" $guest_ip arch && {
             success=true; echo "SSHD in container $lxc is UP on IP $guest_ip"; break ; } || :
         # some of our boxes have gone through a long upgrade historically, and
         # so they don't end up with the same gid mapping for the ssh_keys
-- 
2.43.0