make arch-nspawn and archbuild compatible with pentium4v20190414

pentium4 is unknown to setarch - we must replace it by i686 if used as argument to setarch

1 files changed, 6 insertions, 1 deletions

diff --git a/arch-nspawn.in b/arch-nspawn.in
index f217b1e..f017a66 100644
--- a/arch-nspawn.in
+++ b/arch-nspawn.in
@@ -118,8 +118,13 @@ copy_hostconf
 eval "$(grep -a '^CARCH=' "$working_dir/etc/makepkg.conf")"
 
 [[ -z $nosetarch ]] || unset CARCH
+if [[ "${CARCH}" = 'pentium4' ]]; then
+	set_arch='i686'
+else
+	set_arch="${CARCH}"
+fi
 
-exec ${CARCH:+setarch "$CARCH"} systemd-nspawn -q \
+exec ${CARCH:+setarch "$set_arch"} systemd-nspawn -q \
 	-D "$working_dir" \
 	-E "PATH=/usr/local/sbin:/usr/local/bin:/usr/bin" \
 	--register=no --keep-unit --as-pid2 \