From patchwork Fri Jul 14 10:04:50 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christian Hesse X-Patchwork-Id: 209 Return-Path: Delivered-To: patchwork@archlinux.org Received: from nymeria.archlinux.org by nymeria.archlinux.org with LMTP id gHMQKUyXaFmhGwAAtiB/HQ for ; Fri, 14 Jul 2017 12:05:00 +0200 Received: from nymeria.archlinux.org (localhost.localdomain [127.0.0.1]) by nymeria.archlinux.org (Postfix) with ESMTP id C69B540289; Fri, 14 Jul 2017 12:04:59 +0200 (CEST) X-Spam-Checker-Version: SpamAssassin 3.4.1 (2015-04-28) on nymeria.archlinux.org X-Spam-Level: X-Spam-Status: No, score=-4.3 required=2.5 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,RCVD_IN_DNSWL_MED shortcircuit=no autolearn=unavailable autolearn_force=no version=3.4.1 Received: from luna.archlinux.org (luna.archlinux.org [5.9.250.164]) (using TLSv1.2 with cipher ADH-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by nymeria.archlinux.org (Postfix) with ESMTPS; Fri, 14 Jul 2017 12:04:59 +0200 (CEST) Received: from luna.archlinux.org (luna.archlinux.org [127.0.0.1]) by luna.archlinux.org (Postfix) with ESMTP id 8D0E72BF53; Fri, 14 Jul 2017 10:04:59 +0000 (UTC) Authentication-Results: luna.archlinux.org; dkim=pass (1024-bit key) header.d=eworm.de header.i=@eworm.de header.b=vl2zA09H Received: from luna.archlinux.org (luna.archlinux.org [127.0.0.1]) by luna.archlinux.org (Postfix) with ESMTP id BA97C208AF for ; Fri, 14 Jul 2017 10:04:58 +0000 (UTC) Received: from nymeria.archlinux.org (nymeria.archlinux.org [IPv6:2a00:1828:2000:547::2]) by luna.archlinux.org (Postfix) with ESMTPS for ; Fri, 14 Jul 2017 10:04:58 +0000 (UTC) Received: from nymeria.archlinux.org (localhost.localdomain [127.0.0.1]) by nymeria.archlinux.org (Postfix) with ESMTP id 6EB9F40241 for ; Fri, 14 Jul 2017 12:04:57 +0200 (CEST) Received: from mx.mylinuxtime.de (mx.mylinuxtime.de [148.251.109.235]) (using TLSv1.2 with cipher ADH-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by nymeria.archlinux.org (Postfix) with ESMTPS for ; Fri, 14 Jul 2017 12:04:57 +0200 (CEST) Received: from leda.eworm.de (unknown [10.10.1.27]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx.mylinuxtime.de (Postfix) with ESMTPSA id 15121252DA; Fri, 14 Jul 2017 12:04:57 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.10.3 mx.mylinuxtime.de 15121252DA DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=eworm.de; s=mail; t=1500026697; bh=Lbv8CctDZf6WfPuinpm72T/32aPV+FEqENpYH7XmeWQ=; h=From:To:Cc:Subject:Date; b=vl2zA09Hbwi7Bzk8TBYTkioZMphrQggupKV0WU8nV0UVNEmQ1r9je9dJO8vtckSOL g3UwCWUGBCCVsbQfPp8qVbsCAG2+FkiBRdexdXzizfF5KR5l7kQVOzx73zHQJ9PV+l X9itbBKeegnpzm6HXOb1Gx9CMxsRAbqJS/eVAnjc= Received: by leda.eworm.de (Postfix, from userid 1000) id D0C421011EA; Fri, 14 Jul 2017 12:04:51 +0200 (CEST) From: Christian Hesse To: arch-projects@archlinux.org Date: Fri, 14 Jul 2017 12:04:50 +0200 Message-Id: <20170714100450.5223-1-list@eworm.de> X-Mailer: git-send-email 2.13.3 Subject: [arch-projects] [devtools] [PATCH 1/1] arch-nspawn: get mirror url from chroot's pacman.conf X-BeenThere: arch-projects@archlinux.org X-Mailman-Version: 2.1.24 Precedence: list List-Id: Arch Linux projects development discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: Arch Linux projects development discussion Cc: Christian Hesse Errors-To: arch-projects-bounces@archlinux.org Sender: "arch-projects" X-UID: 492 Status: X-Keywords: Content-Length: 1093 From: Christian Hesse My system has a mirror configuration where only the host can access a special url from pacman.conf but chroots and containers fail. Instead of host's pacman.conf use $pac_conf or pacman.conf from chroot. This still uses host's /etc/pacman.d/mirrorlist and should achieve the expected results. Signed-off-by: Christian Hesse --- arch-nspawn.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch-nspawn.in b/arch-nspawn.in index c21b2ce..ffc7267 100644 --- a/arch-nspawn.in +++ b/arch-nspawn.in @@ -59,7 +59,7 @@ else fi # shellcheck disable=2016 -host_mirror=$(pacman --cachedir /doesnt/exist -Sddp extra/devtools 2>/dev/null | sed -r 's#(.*/)extra/os/.*#\1$repo/os/$arch#') +host_mirror=$(pacman --config "${pac_conf:-$working_dir/etc/pacman.conf}" --cachedir /doesnt/exist -Sddp extra/devtools 2>/dev/null | sed -r 's#(.*/)extra/os/.*#\1$repo/os/$arch#') # shellcheck disable=2016 [[ $host_mirror == *file://* ]] && host_mirror_path=$(echo "$host_mirror" | sed -r 's#file://(/.*)/\$repo/os/\$arch#\1#g')