summaryrefslogtreecommitdiff
path: root/src/chroot-tools/mkarchroot.patch
blob: 171b38a964fae50ba091bf6430f7499f918fcebd (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
--- mkarchroot.in	2014-03-21 13:59:31.593002027 -0400
+++ mkarchroot.ugly	2014-03-21 14:23:12.027238102 -0400
@@ -1,4 +1,6 @@
 #!/bin/bash
+# License: GNU GPLv2
+#
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
 # the Free Software Foundation; version 2 of the License.
@@ -65,6 +67,11 @@
 	chmod 0755 "$working_dir"
 fi
 
+_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'
 
@@ -72,7 +79,7 @@
 echo 'LANG=C' > "$working_dir/etc/locale.conf"
 echo "$CHROOT_VERSION" > "$working_dir/.arch-chroot"
 
-exec arch-nspawn \
+exec $(librelib chroot/arch-nspawn) \
 	${pac_conf:+-C "$pac_conf"} \
 	${makepkg_conf:+-M "$makepkg_conf"} \
 	${cache_dir:+-c "$cache_dir"} \