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 11:17:32 +0200
commit0d4552bfd3b20f1b484b2e87e60ed78be5cd9815 (patch)
tree5f686a759023fea788eb2b233f5dae4b494db340 /arch-nspawn.in
parentd0efd9fed6065e2149d8b0ff9d827d72de4d8b1a (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 a552dea..f0899c0 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 \