diff options
| author | Erich Eckner <git@eckner.net> | 2019-04-13 14:32:36 +0200 |
|---|---|---|
| committer | Erich Eckner <git@eckner.net> | 2019-08-18 20:19:42 +0200 |
| commit | 7613f310b1539bcfe9628e02b49844bac94f23c2 (patch) | |
| tree | 067e7f616e1f53beaddecccea36bbdb313e9bba3 /arch-nspawn.in | |
| parent | 4b688ec23735bb5c80364e3de02e477c69986011 (diff) | |
| download | devtools32-7613f310b1539bcfe9628e02b49844bac94f23c2.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 0e7fe20..d689b77 100644 --- a/arch-nspawn.in +++ b/arch-nspawn.in @@ -133,8 +133,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 \ |