From fd01d1904cc7a3896f127671b0f16ec1d6822d8e Mon Sep 17 00:00:00 2001
From: David P <megver83@parabola.nu>
Date: Tue, 3 Aug 2021 11:11:10 -0400
Subject: mkparabolaiso: small sync with mkarchiso

Signed-off-by: David P <megver83@parabola.nu>
---
 parabolaiso/mkparabolaiso | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

(limited to 'parabolaiso/mkparabolaiso')

diff --git a/parabolaiso/mkparabolaiso b/parabolaiso/mkparabolaiso
index c39e6b9..b4457b8 100755
--- a/parabolaiso/mkparabolaiso
+++ b/parabolaiso/mkparabolaiso
@@ -411,6 +411,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 parabolaiso version."
         chmod -f -- +x "${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."
@@ -518,7 +519,7 @@ _make_efibootimg() {
     mmd -i "${work_dir}/efiboot.img" ::/EFI ::/EFI/BOOT
 }
 
-# Prepare efiboot.img::/EFI for EFI boot mode (systemd)
+# Prepare system-boot for booting when written to a disk (isohybrid)
 _make_bootmode_uefi-x64.systemd-boot.esp() {
     local efiboot_imgsize
     _msg_info "Setting up systemd-boot for UEFI booting..."
@@ -561,7 +562,7 @@ _make_bootmode_uefi-x64.systemd-boot.esp() {
     _msg_info "Done! systemd-boot set up for UEFI booting successfully."
 }
 
-# Prepare efiboot.img::/EFI for EFI boot mode (rEFInd)
+# Prepare rEFInd for booting when written to a disk (isohybrid)
 _make_bootmode_uefi-x64.refind.esp() {
     local efiboot_imgsize
     _msg_info "Setting up rEFInd for UEFI booting..."
@@ -906,6 +907,7 @@ _validate_requirements_buildmode_iso() {
         _msg_error "Validating build mode '${_buildmode}': awk is not available on this host. Install 'awk'!" 0
     fi
 }
+
 _validate_requirements_buildmode_netboot() {
     _validate_requirements_buildmode_all
     if ! command -v openssl &> /dev/null; then
@@ -1300,7 +1302,6 @@ _validate_options() {
             _msg_error "${bootmode} is not a valid boot mode!" 0
         fi
     done
-
     # Check if the specified airootfs_image_type is supported
     if typeset -f "_mkairootfs_${airootfs_image_type}" &> /dev/null; then
         if typeset -f "_validate_requirements_airootfs_image_type_${airootfs_image_type}" &> /dev/null; then
@@ -1448,6 +1449,7 @@ _build_iso_base() {
     # Set up essential directory paths
     pacstrap_dir="${work_dir}/${arch}/airootfs"
     isofs_dir="${work_dir}/iso"
+
     # Create working directory
     [[ -d "${work_dir}" ]] || install -d -- "${work_dir}"
     # Write build date to file or if the file exists, read it from there
-- 
cgit v1.2.2