From 4153cd46e23426ee725736dd4a2806d0df596ced Mon Sep 17 00:00:00 2001 From: André Fabian Silva Delgado Date: Wed, 11 May 2016 01:40:52 -0300 Subject: 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. --- arch-nspawn.in | 19 +++++-------------- 1 file 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[@]}" \ + "$@" -- cgit v1.2.3-70-g09d2