Send patches - preferably formatted by git format-patch - to patches at archlinux32 dot org.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authornl6720 <nl6720@gmail.com>2021-07-02 13:50:41 +0300
committernl6720 <nl6720@gmail.com>2021-07-02 15:54:33 +0300
commitc4d1109e49197e8ecb546ae8c47c3dda767a9e95 (patch)
treeec50b02ac6e8b2d07d5c6d51ae79611913a05a47
parent33a2ab6332f8c4db49542fc8ac70ffaf6331feb9 (diff)
Revert "archiso/mkarchiso: clear environment variables when chrooting"
This reverts commit 3d6651abf74ee4eb91212bd9a7d3478c95126cfb. A missing $PATH breaks scripts that do not hardcode binary paths. Fixes https://bugs.archlinux.org/task/71416 .
-rwxr-xr-xarchiso/mkarchiso9
1 files changed, 4 insertions, 5 deletions
diff --git a/archiso/mkarchiso b/archiso/mkarchiso
index 7cec3a9..0fee7e2 100755
--- a/archiso/mkarchiso
+++ b/archiso/mkarchiso
@@ -322,18 +322,17 @@ _make_custom_airootfs() {
# Install desired packages to airootfs
_make_packages() {
- local envvars_in_chroot=("SOURCE_DATE_EPOCH=${SOURCE_DATE_EPOCH}")
_msg_info "Installing packages to '${pacstrap_dir}/'..."
if [[ -n "${gpg_key}" ]]; then
exec {ARCHISO_GNUPG_FD}<>"${work_dir}/pubkey.gpg"
- envvars_in_chroot+=("ARCHISO_GNUPG_FD=${ARCHISO_GNUPG_FD}")
+ export ARCHISO_GNUPG_FD
fi
if [[ "${quiet}" = "y" ]]; then
- env -i "${envvars_in_chroot[@]}" pacstrap -C "${work_dir}/${buildmode}.pacman.conf" -c -G -M -- "${pacstrap_dir}" "${buildmode_pkg_list[@]}" &> /dev/null
+ pacstrap -C "${work_dir}/${buildmode}.pacman.conf" -c -G -M -- "${pacstrap_dir}" "${buildmode_pkg_list[@]}" &> /dev/null
else
- env -i "${envvars_in_chroot[@]}" pacstrap -C "${work_dir}/${buildmode}.pacman.conf" -c -G -M -- "${pacstrap_dir}" "${buildmode_pkg_list[@]}"
+ pacstrap -C "${work_dir}/${buildmode}.pacman.conf" -c -G -M -- "${pacstrap_dir}" "${buildmode_pkg_list[@]}"
fi
if [[ -n "${gpg_key}" ]]; then
@@ -375,7 +374,7 @@ _make_customize_airootfs() {
_msg_info "Running customize_airootfs.sh in '${pacstrap_dir}' chroot..."
_msg_warning "customize_airootfs.sh is deprecated! Support for it will be removed in a future archiso version."
chmod -f -- +x "${pacstrap_dir}/root/customize_airootfs.sh"
- eval -- env -i "SOURCE_DATE_EPOCH=${SOURCE_DATE_EPOCH}" arch-chroot "${pacstrap_dir}" "/root/customize_airootfs.sh"
+ eval -- arch-chroot "${pacstrap_dir}" "/root/customize_airootfs.sh"
rm -- "${pacstrap_dir}/root/customize_airootfs.sh"
_msg_info "Done! customize_airootfs.sh run successfully."
fi