diff options
| author | Erich Eckner <git@eckner.net> | 2020-09-10 15:01:58 +0200 |
|---|---|---|
| committer | Erich Eckner <git@eckner.net> | 2020-09-10 15:01:58 +0200 |
| commit | 7c112660d90e659ca2d252900a91dc30ac528a50 (patch) | |
| tree | 28d34d415171ba2033f397f54dd49204188a2bbd | |
| parent | c70330f57b3ecd585620e1efa684d79a1a912972 (diff) | |
| download | devtools32-7c112660d90e659ca2d252900a91dc30ac528a50.tar.xz | |
arch-nspawn: unset "set_arch" with -s, not CARCH
| -rw-r--r-- | arch-nspawn.in | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch-nspawn.in b/arch-nspawn.in index b9215a6..a069fa6 100644 --- a/arch-nspawn.in +++ b/arch-nspawn.in @@ -127,14 +127,14 @@ copy_hostconf eval "$(grep -a '^CARCH=' "$working_dir/etc/makepkg.conf")" -[[ -z $nosetarch ]] || unset CARCH if [[ -f "@pkgdatadir@/setarch-aliases.d/${CARCH}" ]]; then read -r set_arch < "@pkgdatadir@/setarch-aliases.d/${CARCH}" else set_arch="${CARCH}" fi +[[ -z $nosetarch ]] || unset set_arch -exec ${CARCH:+setarch "$set_arch"} systemd-nspawn -q \ +exec ${set_arch:+setarch "$set_arch"} systemd-nspawn -q \ -D "$working_dir" \ -E "PATH=/usr/local/sbin:/usr/local/bin:/usr/bin" \ --register=no --keep-unit --as-pid2 \ |