diff options
| author | André Fabian Silva Delgado <emulatorman@parabola.nu> | 2016-05-11 01:40:52 -0300 |
|---|---|---|
| committer | André Fabian Silva Delgado <emulatorman@parabola.nu> | 2016-05-11 01:44:38 -0300 |
| commit | 4153cd46e23426ee725736dd4a2806d0df596ced (patch) | |
| tree | 897daf25649577583ad75e7b0788bc807c20c411 /arch-nspawn.in | |
| parent | c3819bb4224622c6d10ab7a3511472f314e026ba (diff) | |
| download | devtools32-4153cd46e23426ee725736dd4a2806d0df596ced.tar.xz | |
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.in | 19 |
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[@]}" \ + "$@" |