From d7ab6b050033da93e46a3b005cdb2cbbb75da814 Mon Sep 17 00:00:00 2001 From: Erich Eckner Date: Thu, 10 Sep 2020 15:01:58 +0200 Subject: arch-nspawn: unset "set_arch" with -s, not CARCH --- src/arch-nspawn.in | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src') diff --git a/src/arch-nspawn.in b/src/arch-nspawn.in index ae50043..bb681b2 100644 --- a/src/arch-nspawn.in +++ b/src/arch-nspawn.in @@ -117,14 +117,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 \ -- cgit v1.2.3-70-g09d2