summaryrefslogtreecommitdiff
path: root/arch-nspawn.in
diff options
context:
space:
mode:
Diffstat (limited to 'arch-nspawn.in')
-rw-r--r--arch-nspawn.in11
1 files changed, 4 insertions, 7 deletions
diff --git a/arch-nspawn.in b/arch-nspawn.in
index f017a66..9a3ae87 100644
--- a/arch-nspawn.in
+++ b/arch-nspawn.in
@@ -117,14 +117,11 @@ 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
+SETARCH="$CARCH"
+[[ -z $nosetarch ]] || unset SETARCH
+[[ "$SETARCH" = "pentium4" ]] && SETARCH="i686"
-exec ${CARCH:+setarch "$set_arch"} systemd-nspawn -q \
+exec ${SETARCH:+setarch "$SETARCH"} systemd-nspawn -q \
-D "$working_dir" \
-E "PATH=/usr/local/sbin:/usr/local/bin:/usr/bin" \
--register=no --keep-unit --as-pid2 \