summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorcoadde [Márcio Alexandre Silva Delgado] <coadde@parabola.nu>2016-05-10 07:16:47 -0300
committercoadde [Márcio Alexandre Silva Delgado] <coadde@parabola.nu>2016-05-10 07:16:47 -0300
commitc3819bb4224622c6d10ab7a3511472f314e026ba (patch)
treeb785354ac1f08d63a71f2f35deaf1040a75ebe10
parentce7a5ea686c5acdfe6b80782b4b2059c121ed902 (diff)
downloaddevtools32-c3819bb4224622c6d10ab7a3511472f314e026ba.tar.xz
remove setarch for non-i686 to support qemu-static
-rw-r--r--arch-nspawn.in19
1 files changed, 14 insertions, 5 deletions
diff --git a/arch-nspawn.in b/arch-nspawn.in
index 4a92f09..dbccdda 100644
--- a/arch-nspawn.in
+++ b/arch-nspawn.in
@@ -96,8 +96,17 @@ copy_hostconf
eval $(grep '^CARCH=' "$working_dir/etc/makepkg.conf")
-exec ${CARCH:+setarch "$CARCH"} systemd-nspawn -q \
- -D "$working_dir" \
- --register=no \
- "${mount_args[@]}" \
- "$@"
+
+if [[ $CARCH = i686 ]]; then
+ exec ${CARCH:+setarch "$CARCH"} systemd-nspawn -q \
+ -D "$working_dir" \
+ --register=no \
+ "${mount_args[@]}" \
+ "$@"
+else
+ exec systemd-nspawn -q \
+ -D "$working_dir" \
+ --register=no \
+ "${mount_args[@]}" \
+ "$@"
+fi