# 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)
# 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)
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)
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