From 27ff286ee78eb2faac803e3ef67f3171ddfa0098 Mon Sep 17 00:00:00 2001 From: Brian Bidulock Date: Sat, 18 Nov 2017 22:53:37 -0700 Subject: arch-nspawn should not take pacman cache from host Previously, arch-nspawn was using the hosts' pacman cache in the chroot even when the chroot was set up with a different cache by mkarchroot, unless specified with the -c flag. Problem is that makechrootpkg passes no -C, -M nor -c flags to arch-nspawn, so all values must be obtained from the working directory. This change take the cache directories from the pacman.conf specified with the -C option unless the -c option was given (as is the case when the chroot is set up with mkarchroot), and, when neither -C nor -c is given (as is the case when invoked by makechrootpkg), the cache directory is taken from the pacman.conf in the working directory. This wasn't such an issue when i686 was mainline, however, which building packages in a chroot against archlinux32 on an x86_64 platform, the cache of the host should _never_ be used. Rebased by eschwartz on top of cachedir reworking. Signed-off-by: Eli Schwartz Signed-off-by: Levente Polyak --- arch-nspawn.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch-nspawn.in b/arch-nspawn.in index a0e24dc..c2bce76 100644 --- a/arch-nspawn.in +++ b/arch-nspawn.in @@ -55,7 +55,7 @@ shift 1 pacconf_cmd=$(command -v pacman-conf || command -v pacconf) if (( ${#cache_dirs[@]} == 0 )); then - mapfile -t cache_dirs < <($pacconf_cmd CacheDir) + mapfile -t cache_dirs < <($pacconf_cmd --config "${pac_conf:-$working_dir/etc/pacman.conf}" CacheDir) fi # shellcheck disable=2016 -- cgit v1.2.3-70-g09d2