diff options
| author | Erich Eckner <git@eckner.net> | 2020-09-10 15:01:58 +0200 |
|---|---|---|
| committer | Erich Eckner <git@eckner.net> | 2021-02-25 12:40:39 +0100 |
| commit | 91c8b3210d83dac004657555bcf47a9b694d50ea (patch) | |
| tree | b03a51365bfb0ef52b6488271e4e00f325f87f2c | |
| parent | ff30ab3a24b5a2634af658682e0d0fc4b8c8ea10 (diff) | |
| download | devtools-91c8b3210d83dac004657555bcf47a9b694d50ea.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 07ccdc9..683b84d 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 \ |