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:55:22 +0300
committernl6720 <nl6720@gmail.com>2021-07-02 15:54:34 +0300
commitd65682a7651bfd7daf74efa439ee1b47c3d98ead (patch)
tree98a9f94072933a155a7842811ad924df43ff4e2a
parentc4d1109e49197e8ecb546ae8c47c3dda767a9e95 (diff)
mkarchiso: unset TMPDIR to work around FS#70580
Alternative to 3d6651abf74ee4eb91212bd9a7d3478c95126cfb which caused issues. Fixes https://bugs.archlinux.org/task/70580 .
-rwxr-xr-xarchiso/mkarchiso8
1 files changed, 5 insertions, 3 deletions
diff --git a/archiso/mkarchiso b/archiso/mkarchiso
index 0fee7e2..7596673 100755
--- a/archiso/mkarchiso
+++ b/archiso/mkarchiso
@@ -329,10 +329,11 @@ _make_packages() {
export ARCHISO_GNUPG_FD
fi
+ # Unset TMPDIR to work around https://bugs.archlinux.org/task/70580
if [[ "${quiet}" = "y" ]]; then
- pacstrap -C "${work_dir}/${buildmode}.pacman.conf" -c -G -M -- "${pacstrap_dir}" "${buildmode_pkg_list[@]}" &> /dev/null
+ env -u TMPDIR pacstrap -C "${work_dir}/${buildmode}.pacman.conf" -c -G -M -- "${pacstrap_dir}" "${buildmode_pkg_list[@]}" &> /dev/null
else
- pacstrap -C "${work_dir}/${buildmode}.pacman.conf" -c -G -M -- "${pacstrap_dir}" "${buildmode_pkg_list[@]}"
+ env -u TMPDIR pacstrap -C "${work_dir}/${buildmode}.pacman.conf" -c -G -M -- "${pacstrap_dir}" "${buildmode_pkg_list[@]}"
fi
if [[ -n "${gpg_key}" ]]; then
@@ -374,7 +375,8 @@ _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 -- arch-chroot "${pacstrap_dir}" "/root/customize_airootfs.sh"
+ # Unset TMPDIR to work around https://bugs.archlinux.org/task/70580
+ eval -- env -u TMPDIR arch-chroot "${pacstrap_dir}" "/root/customize_airootfs.sh"
rm -- "${pacstrap_dir}/root/customize_airootfs.sh"
_msg_info "Done! customize_airootfs.sh run successfully."
fi