From bc4b38164eaecced47dc7c3896a8af7a6cbe1eae Mon Sep 17 00:00:00 2001
From: Erich Eckner <git@eckner.net>
Date: Sat, 13 Apr 2019 14:32:36 +0200
Subject: make arch-nspawn and archbuild compatible with pentium4

pentium4 is unknown to setarch - we must replace it by i686 if used as argument to setarch
---
 arch-nspawn.in | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

(limited to 'arch-nspawn.in')

diff --git a/arch-nspawn.in b/arch-nspawn.in
index 3670ba9..7dcff7b 100644
--- a/arch-nspawn.in
+++ b/arch-nspawn.in
@@ -131,8 +131,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 \
-- 
cgit v1.2.3-70-g09d2