summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEli Schwartz <eschwartz@archlinux.org>2018-12-05 00:06:44 +0100
committerLevente Polyak <anthraxx@archlinux.org>2019-08-09 19:40:05 +0200
commitc2bbcbed64e70b1e92c697be2f17a050a8341f87 (patch)
tree43c4de991d278b5c7c04fe7566ffe6a2d4562c39
parentb7ce90fefc371b47c9036d36d741139a4dd8efe2 (diff)
downloaddevtools-c2bbcbed64e70b1e92c697be2f17a050a8341f87.tar.gz
devtools-c2bbcbed64e70b1e92c697be2f17a050a8341f87.tar.xz
mkarchroot: don't create a broken chroot by default
It's incorrect to make pacman completely useless inside the chroot by starting off with no pacman keyring. Assuming that the only consumers of a new chroot will be arch-nspawn (which copies over the hostconf) is bad design, and furthermore makes it impossible to fix other issues in arch-nspawn itself. Signed-off-by: Eli Schwartz <eschwartz@archlinux.org> Signed-off-by: Levente Polyak <anthraxx@archlinux.org>
-rw-r--r--mkarchroot.in2
1 files changed, 1 insertions, 1 deletions
diff --git a/mkarchroot.in b/mkarchroot.in
index 9d23b60..7d97318 100644
--- a/mkarchroot.in
+++ b/mkarchroot.in
@@ -86,7 +86,7 @@ while read -r varname; do
_env+=("$varname=${!varname}")
done < <(declare -x | sed -r 's/^declare -x ([^=]*)=.*/\1/' | grep -i '_proxy$')
env -i "${_env[@]}" \
-pacstrap -GMcd ${pac_conf:+-C "$pac_conf"} "$working_dir" \
+pacstrap -Mcd ${pac_conf:+-C "$pac_conf"} "$working_dir" \
"${cache_dirs[@]/#/--cachedir=}" "$@" || die 'Failed to install all packages'
printf '%s.UTF-8 UTF-8\n' en_US de_DE > "$working_dir/etc/locale.gen"