diff options
| author | Erich Eckner <git@eckner.net> | 2020-09-10 15:01:58 +0200 |
|---|---|---|
| committer | Erich Eckner <git@eckner.net> | 2021-02-25 11:08:31 +0100 |
| commit | f7316edb4c7969cf9ca015f429227cb2e59f0c13 (patch) | |
| tree | c10cf72e45344cda3d039ce6d5f6626ded658d34 | |
| parent | 6a1fb9315af0a7b1139c68f340913d331c100970 (diff) | |
| download | devtools32-f7316edb4c7969cf9ca015f429227cb2e59f0c13.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 468e5fe..a32f82d 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 \ |