index : devtools32 | |
Archlinux32 fork of devtools | gitolite user |
summaryrefslogtreecommitdiff |
author | Erich Eckner <git@eckner.net> | 2017-06-16 21:31:37 +0200 |
---|---|---|
committer | Erich Eckner <git@eckner.net> | 2017-06-16 21:31:37 +0200 |
commit | 0e8a0807547251e08560a213e7f940c16b4025be (patch) | |
tree | 9e6c9670befbfef584528a30c048d7c50a15b0f6 /arch-nspawn.in | |
parent | 6d847f9c794f13515102e6d564c7d7336663c1a6 (diff) |
-rw-r--r-- | arch-nspawn.in | 3 |
diff --git a/arch-nspawn.in b/arch-nspawn.in index 36ccf5b..8b3d84e 100644 --- a/arch-nspawn.in +++ b/arch-nspawn.in @@ -90,6 +90,7 @@ copy_hostconf () { done sed -r "s|^#?\\s*CacheDir.+|CacheDir = $(echo -n ${cache_dirs[@]})|g" -i "$working_dir/etc/pacman.conf" + eval $(grep '^CARCH=' "$working_dir/etc/makepkg.conf") sed -i '/^Architecture = /s| auto$| '"$CARCH|" "$working_dir/etc/pacman.conf" } # }}} @@ -106,8 +107,6 @@ fi build_mount_args copy_hostconf -eval $(grep '^CARCH=' "$working_dir/etc/makepkg.conf") - [[ -z $nosetarch ]] || unset CARCH exec ${CARCH:+setarch "$CARCH"} systemd-nspawn -q \ |