index : devtools32 | |
Archlinux32 fork of devtools | gitolite user |
summaryrefslogtreecommitdiff |
author | Erich Eckner <git@eckner.net> | 2017-06-16 17:17:19 +0200 |
---|---|---|
committer | Erich Eckner <git@eckner.net> | 2018-05-16 16:39:44 +0200 |
commit | e03043eb6235eccaeae49894ce889c79293eb800 (patch) | |
tree | 08a53ec56f832581d5d3612a7ecbe500556d8e8f /arch-nspawn.in | |
parent | a3425afdd9cb1e90c2c80bcd803e95f9d6ea3c80 (diff) |
-rw-r--r-- | arch-nspawn.in | 3 |
diff --git a/arch-nspawn.in b/arch-nspawn.in index 93d3bf7..cf6c236 100644 --- a/arch-nspawn.in +++ b/arch-nspawn.in @@ -92,6 +92,7 @@ copy_hostconf () { done sed -r "s|^#?\\s*CacheDir.+|CacheDir = ${cache_dirs[*]}|g" -i "$working_dir/etc/pacman.conf" + eval "$(grep -a '^CARCH=' "$working_dir/etc/makepkg.conf")" sed -i '/^Architecture = /s| auto$| '"$CARCH|" "$working_dir/etc/pacman.conf" } # }}} @@ -108,8 +109,6 @@ fi build_mount_args copy_hostconf -eval "$(grep -a '^CARCH=' "$working_dir/etc/makepkg.conf")" - [[ -z $nosetarch ]] || unset CARCH exec ${CARCH:+setarch "$CARCH"} systemd-nspawn -q \ |