diff options
| author | Erich Eckner <git@eckner.net> | 2019-04-13 14:32:36 +0200 |
|---|---|---|
| committer | Erich Eckner <git@eckner.net> | 2020-02-19 09:52:08 +0100 |
| commit | b12f8fe34f812187c37a094770968ed7eb00e661 (patch) | |
| tree | 5f7c5848ada796d73574f35b5656e30e76a76bcb /arch-nspawn.in | |
| parent | dca5b65c4d1b245203423e44ab96dae8e031aa78 (diff) | |
| download | devtools32-b12f8fe34f812187c37a094770968ed7eb00e661.tar.xz | |
make arch-nspawn and archbuild compatible with pentium4
pentium4 is unknown to setarch - we must replace it by i686 if used as argument to setarch
Diffstat (limited to 'arch-nspawn.in')
| -rw-r--r-- | arch-nspawn.in | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/arch-nspawn.in b/arch-nspawn.in index 08f24b7..5d8b3d1 100644 --- a/arch-nspawn.in +++ b/arch-nspawn.in @@ -126,8 +126,13 @@ copy_hostconf eval "$(grep -a '^CARCH=' "$working_dir/etc/makepkg.conf")" [[ -z $nosetarch ]] || unset CARCH +if [[ "${CARCH}" = 'pentium4' ]]; then + set_arch='i686' +else + set_arch="${CARCH}" +fi -exec ${CARCH:+setarch "$CARCH"} systemd-nspawn -q \ +exec ${CARCH:+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 \ |