[devtools] $pacconf_cmd in arch-nspawn should use the provided config file (-C)

Message ID 20190401094154.27020-1-arch@eckner.net
State New
Headers show
Series
  • [devtools] $pacconf_cmd in arch-nspawn should use the provided config file (-C)
Related show

Commit Message

Eli Schwartz via arch-projects April 1, 2019, 9:41 a.m. UTC
From: Erich Eckner <git@eckner.net>

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 when determining the remote servers.

For example, Arch Linux 32 provides separate pacman configurations 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.

Signed-off-by: Erich Eckner <git@eckner.net>
---
 arch-nspawn.in | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

Patch

diff --git a/arch-nspawn.in b/arch-nspawn.in
index e68e2e75..461154eb 100644
--- a/arch-nspawn.in
+++ b/arch-nspawn.in
@@ -60,8 +60,7 @@  fi
 
 pacconf_cmd=$(command -v pacman-conf || command -v pacconf)
 # shellcheck disable=2016
-host_mirrors=($($pacconf_cmd --repo extra Server 2> /dev/null | sed -r 's#(.*/)extra/os/.*#\1$repo/os/$arch#'))
-# shellcheck disable=2016
+host_mirrors=($($pacconf_cmd ${pac_conf+--conf $pac_conf} --repo extra Server 2> /dev/null | sed -r 's#(.*/)extra/os/.*#\1$repo/os/$arch#'))
 
 # {{{ functions
 build_mount_args() {