From 0e8a0807547251e08560a213e7f940c16b4025be Mon Sep 17 00:00:00 2001
From: Erich Eckner <git@eckner.net>
Date: Fri, 16 Jun 2017 21:31:37 +0200
Subject: bugfixes concerning $CARCH, Architecture= and --cache

---
 arch-nspawn.in | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

(limited to 'arch-nspawn.in')

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 \
-- 
cgit v1.2.3-54-g00ecf