2019-09-21 15:13:45 +00:00
|
|
|
From 716ebf85d285c0b2bedfa368bcb670b5820eb373 Mon Sep 17 00:00:00 2001
|
2014-12-30 02:41:19 +00:00
|
|
|
From: Kevin Mihelich <kevin@archlinuxarm.org>
|
|
|
|
Date: Sun, 28 Dec 2014 22:27:34 -0700
|
2018-05-31 18:51:19 +00:00
|
|
|
Subject: [PATCH 2/7] arch-nspawn: keep mirrorlist
|
2014-12-30 02:41:19 +00:00
|
|
|
|
|
|
|
---
|
|
|
|
arch-nspawn.in | 2 +-
|
|
|
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
|
|
|
|
|
|
diff --git a/arch-nspawn.in b/arch-nspawn.in
|
2019-09-21 15:13:45 +00:00
|
|
|
index 5817143..496fbd4 100644
|
2014-12-30 02:41:19 +00:00
|
|
|
--- a/arch-nspawn.in
|
|
|
|
+++ b/arch-nspawn.in
|
2019-09-21 15:13:45 +00:00
|
|
|
@@ -99,7 +99,7 @@ build_mount_args() {
|
2013-06-27 17:15:42 +00:00
|
|
|
copy_hostconf () {
|
2019-09-21 15:13:45 +00:00
|
|
|
unshare --fork --pid gpg --homedir "$working_dir"/etc/pacman.d/gnupg/ --no-permission-warning --quiet --batch --import --import-options import-local-sigs "$(pacman-conf GpgDir)"/pubring.gpg >/dev/null 2>&1
|
|
|
|
pacman-key --gpgdir "$working_dir"/etc/pacman.d/gnupg/ --import-trustdb "$(pacman-conf GpgDir)" >/dev/null 2>&1
|
2019-06-09 21:08:25 +00:00
|
|
|
- printf 'Server = %s\n' "${host_mirrors[@]}" >"$working_dir/etc/pacman.d/mirrorlist"
|
|
|
|
+ #printf 'Server = %s\n' "${host_mirrors[@]}" >"$working_dir/etc/pacman.d/mirrorlist"
|
2013-06-27 17:15:42 +00:00
|
|
|
|
2017-12-13 01:42:01 +00:00
|
|
|
[[ -n $pac_conf ]] && cp "$pac_conf" "$working_dir/etc/pacman.conf"
|
|
|
|
[[ -n $makepkg_conf ]] && cp "$makepkg_conf" "$working_dir/etc/makepkg.conf"
|
2014-12-30 02:41:19 +00:00
|
|
|
--
|
2019-09-21 15:13:45 +00:00
|
|
|
2.22.0
|
2014-12-30 02:41:19 +00:00
|
|
|
|