summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLuke Shumaker <lukeshu@parabola.nu>2017-02-15 15:00:12 -0500
committerLuke Shumaker <lukeshu@parabola.nu>2017-04-05 15:02:25 -0400
commitbd49dd6f28b67692e001d95f0d1bc388ba16541c (patch)
treee88c5299bfa84521f42434fe5ab4696b8b49c802
parent8b3a673607d048cd738fae150cd338670609990c (diff)
mkarchroot: Don't let the environment affect pacstrap (sans proxy settings).lukeshu/to-upstream/likely-20170405
A previous iteration of this change (libretools commit d7dcce53396d) simply inserted `env -i` to clear the environment. However, that lead to it ignoring proxy settings, which some users had problems with: https://labs.parabola.nu/issues/487: > To fix other bugs, the pacstrap environment is blank, which also > means that the proxy settings are blank. So (in libretools commit d17d1d82349f), I changed it to use `declare -x` to inspect the environment, and create a version of it only consisting of variables ending with "_proxy" (case-insensitive). I honestly don't remember what "other bugs" prompted me to clear the environment in the first place.
-rw-r--r--mkarchroot.in5
1 files changed, 5 insertions, 0 deletions
diff --git a/mkarchroot.in b/mkarchroot.in
index 9f365e8..3aff357 100644
--- a/mkarchroot.in
+++ b/mkarchroot.in
@@ -78,6 +78,11 @@ for file in "${files[@]}"; do
cp "$file" "$working_dir$file"
done
+_env=()
+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" \
"${cache_dirs[@]/#/--cachedir=}" "$@" || die 'Failed to install all packages'