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:
authorAndré Fabian Silva Delgado <emulatorman@parabola.nu>2016-05-11 01:40:52 -0300
committerAndré Fabian Silva Delgado <emulatorman@parabola.nu>2016-05-11 01:44:38 -0300
commit4153cd46e23426ee725736dd4a2806d0df596ced (patch)
tree897daf25649577583ad75e7b0788bc807c20c411 /arch-nspawn.in
parentc3819bb4224622c6d10ab7a3511472f314e026ba (diff)
Revert "remove setarch for non-i686 to support qemu-static" since Libretools arch-nspawn has the `-s` flag to turn off setarch
This reverts commit c3819bb4224622c6d10ab7a3511472f314e026ba.
Diffstat (limited to 'arch-nspawn.in')
-rw-r--r--arch-nspawn.in19
1 files changed, 5 insertions, 14 deletions
diff --git a/arch-nspawn.in b/arch-nspawn.in
index dbccdda..4a92f09 100644
--- a/arch-nspawn.in
+++ b/arch-nspawn.in
@@ -96,17 +96,8 @@ copy_hostconf
eval $(grep '^CARCH=' "$working_dir/etc/makepkg.conf")
-
-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
+exec ${CARCH:+setarch "$CARCH"} systemd-nspawn -q \
+ -D "$working_dir" \
+ --register=no \
+ "${mount_args[@]}" \
+ "$@"