diff options
| author | Erich Eckner <git@eckner.net> | 2019-04-01 10:38:05 +0200 |
|---|---|---|
| committer | Erich Eckner <git@eckner.net> | 2019-09-13 09:21:45 +0200 |
| commit | 5c497c1b3cbd96306a9684566976fa43a7fd756b (patch) | |
| tree | 2762d6e7eafe7a5f5c048253742cb7ba13f708f4 | |
| parent | bbcff883d59e2fce4b26d241892bf83c70e9b704 (diff) | |
| download | devtools-5c497c1b3cbd96306a9684566976fa43a7fd756b.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.
| -rw-r--r-- | arch-nspawn.in | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch-nspawn.in b/arch-nspawn.in index 5817143..70fd854 100644 --- a/arch-nspawn.in +++ b/arch-nspawn.in @@ -63,7 +63,7 @@ if (( ${#cache_dirs[@]} == 0 )); then fi # shellcheck disable=2016 -host_mirrors=($($pacconf_cmd --repo extra Server 2> /dev/null | sed -r 's#(.*/)extra/os/.*#\1$repo/os/$arch#')) +host_mirrors=($($pacconf_cmd --config "${pac_conf:-$working_dir/etc/pacman.conf}" --repo extra Server 2> /dev/null | sed -r 's#(.*/)extra/os/.*#\1$repo/os/$arch#')) while read -r line; do mapfile -t lines < <($pacconf_cmd --config "${pac_conf:-$working_dir/etc/pacman.conf}" \ |