summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrian Bidulock <bidulock@openss7.org>2017-11-18 22:53:37 -0700
committerErich Eckner <git@eckner.net>2018-06-27 10:44:48 +0200
commitce11f073408f27eb678376838425c1816f15e9c5 (patch)
tree82456ba3d749217f5c506521ac8bb322bb92e838
parent1226fb96b88bce6e91164eb29839793b176bd0a4 (diff)
downloaddevtools32-ce11f073408f27eb678376838425c1816f15e9c5.tar.xz
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.
-rw-r--r--arch-nspawn.in6
1 files changed, 5 insertions, 1 deletions
diff --git a/arch-nspawn.in b/arch-nspawn.in
index d04bb30..1292436 100644
--- a/arch-nspawn.in
+++ b/arch-nspawn.in
@@ -53,7 +53,11 @@ shift 1
[[ -z $working_dir ]] && die 'Please specify a working directory.'
if [[ -z $cache_dir ]]; then
- cache_dirs=($(pacman -v 2>&1 | grep '^Cache Dirs:' | sed 's/Cache Dirs:\s*//g'))
+ if [[ -z $pac_conf ]]; then
+ cache_dirs=($(pacman --config "$working_dir/etc/pacman.conf" -v 2>&1 | grep '^Cache Dirs:' | sed 's/Cache Dirs:\s*//g'))
+ else
+ cache_dirs=($(pacman --config "$pac_conf" -v 2>&1 | grep '^Cache Dirs:' | sed 's/Cache Dirs:\s*//g'))
+ fi
else
cache_dirs=("$cache_dir")
fi