Send patches - preferably formatted by git format-patch - to patches at archlinux32 dot org.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorErich Eckner <git@eckner.net>2020-09-10 15:01:58 +0200
committerErich Eckner <git@eckner.net>2022-12-08 12:57:22 +0100
commitd7ab6b050033da93e46a3b005cdb2cbbb75da814 (patch)
tree8f6da8cee6eb03381546ffbc571a0d94bdb7283f
parentd8fc0ceb44fbafbbaf4a3691d686e2609d6340fc (diff)
arch-nspawn: unset "set_arch" with -s, not CARCH
-rw-r--r--src/arch-nspawn.in4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/arch-nspawn.in b/src/arch-nspawn.in
index ae50043..bb681b2 100644
--- a/src/arch-nspawn.in
+++ b/src/arch-nspawn.in
@@ -117,14 +117,14 @@ copy_hostconf
eval "$(grep -a '^CARCH=' "$working_dir/etc/makepkg.conf")"
-[[ -z $nosetarch ]] || unset CARCH
if [[ -f "@pkgdatadir@/setarch-aliases.d/${CARCH}" ]]; then
read -r set_arch < "@pkgdatadir@/setarch-aliases.d/${CARCH}"
else
set_arch="${CARCH}"
fi
+[[ -z $nosetarch ]] || unset set_arch
-exec ${CARCH:+setarch "$set_arch"} systemd-nspawn -q \
+exec ${set_arch:+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 \