diff options
| author | Erich Eckner <git@eckner.net> | 2019-04-01 10:38:05 +0200 |
|---|---|---|
| committer | Erich Eckner <git@eckner.net> | 2022-12-08 12:57:22 +0100 |
| commit | e11e5488dffe28f99151b4e30e3136c1665ef9cb (patch) | |
| tree | e2bda5884920c134bc303048b5ac7bc731d4b3ab /src | |
| parent | a40356bdeff8e9a5b93cf2b57de039abec57f9e3 (diff) | |
| download | devtools-e11e5488dffe28f99151b4e30e3136c1665ef9cb.tar.xz | |
arch-nspawn should use the correct pacman config file
If arch-nspawn is called with -C, pacman inside the chroot will use
the provided configuration file. This should also be the case for
$pacconf_cmd and pacman outside the chroot.
If arch-nspawn is called without -C, pacman inside the chroot will
use $workdir/etc/pacman.conf -- again, $pacconf_cmd and pacman
outside the chroot should use that, too. So lets just set $pac_conf
in that case.
For example, Arch Linux 32 provides separate pacman configurations
inside /usr/share/devtools which use /etc/pacman.d/mirrorlist32 as
mirrorlist for their build commands (extra-i686-build, etc.). This
way, we can build i686 and x86_64 packages on the same x86_64 host
with very minimal changes to devtools.
Diffstat (limited to 'src')
| -rw-r--r-- | src/arch-nspawn.in | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/arch-nspawn.in b/src/arch-nspawn.in index 275cff7..9086684 100644 --- a/src/arch-nspawn.in +++ b/src/arch-nspawn.in @@ -54,7 +54,7 @@ if (( ${#cache_dirs[@]} == 0 )); then fi # shellcheck disable=2016 -host_mirrors=($(pacman-conf --repo extra Server 2> /dev/null | sed -r 's#(.*/)extra/os/.*#\1$repo/os/$arch#')) +host_mirrors=($(pacman-conf --config "${pac_conf:-$working_dir/etc/pacman.conf}" --repo extra Server 2> /dev/null | sed -r 's#(.*/)extra/os/.*#\1$repo/os/$arch#')) for host_mirror in "${host_mirrors[@]}"; do if [[ $host_mirror == *file://* ]]; then |