From c3819bb4224622c6d10ab7a3511472f314e026ba Mon Sep 17 00:00:00 2001 From: "coadde [Márcio Alexandre Silva Delgado]" Date: Tue, 10 May 2016 07:16:47 -0300 Subject: remove setarch for non-i686 to support qemu-static --- arch-nspawn.in | 19 ++++++++++++++----- 1 file 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 -- cgit v1.2.3-54-g00ecf