Send patches - preferably formatted by git format-patch - to patches at archlinux32 dot org.
summaryrefslogtreecommitdiff
path: root/arch-nspawn.in
diff options
context:
space:
mode:
authorErich Eckner <git@eckner.net>2019-04-13 14:32:36 +0200
committerErich Eckner <git@eckner.net>2019-08-20 09:00:45 +0200
commitbc4b38164eaecced47dc7c3896a8af7a6cbe1eae (patch)
treea1a5ede2805d256384e1a5216330590066a27672 /arch-nspawn.in
parent85017d677aab063d6f9080276caf879936ca3cfe (diff)
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
Diffstat (limited to 'arch-nspawn.in')
-rw-r--r--arch-nspawn.in7
1 files changed, 6 insertions, 1 deletions
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 \