diff options
| author | Andreas Baumann <mail@andreasbaumann.cc> | 2019-04-14 09:53:03 +0200 |
|---|---|---|
| committer | Andreas Baumann <mail@andreasbaumann.cc> | 2019-04-14 09:53:03 +0200 |
| commit | 38fe1b9c637201654fdc8ce77c7baaf0bdb9c639 (patch) | |
| tree | cf0b5ec2d78de4cea9c266db05dc6b0c384fe022 /arch-nspawn.in | |
| parent | 15fd0a4b63103eb9c00346b8d233f9e6bc8122d3 (diff) | |
| download | devtools32-38fe1b9c637201654fdc8ce77c7baaf0bdb9c639.tar.xz | |
setting setarch architecture with new variable (for pentium4)pentium4
Diffstat (limited to 'arch-nspawn.in')
| -rw-r--r-- | arch-nspawn.in | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/arch-nspawn.in b/arch-nspawn.in index f017a66..9a3ae87 100644 --- a/arch-nspawn.in +++ b/arch-nspawn.in @@ -117,14 +117,11 @@ 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 +SETARCH="$CARCH" +[[ -z $nosetarch ]] || unset SETARCH +[[ "$SETARCH" = "pentium4" ]] && SETARCH="i686" -exec ${CARCH:+setarch "$set_arch"} systemd-nspawn -q \ +exec ${SETARCH:+setarch "$SETARCH"} systemd-nspawn -q \ -D "$working_dir" \ -E "PATH=/usr/local/sbin:/usr/local/bin:/usr/bin" \ --register=no --keep-unit --as-pid2 \ |