From e264b44682a930f70715ea58cf96e69c87a86b64 Mon Sep 17 00:00:00 2001
From: David Runge <dvzrv@archlinux.org>
Date: Sat, 30 May 2020 00:01:28 +0200
Subject: Add license and basic documentation

LICENSE:
Add GPL-3.0 license.

{{archiso,configs}/*,.editorconfig,.gitlab-ci.yml}:
Add SPDX license identifier.

Makefile:
Add SPDX license identifier.
Install the `run_archiso.sh` script as global executable `run_archiso`.
Use -D and -t flags to install to install files more generically (without a previous call to install the directory).

README.rst:
Add README outlining the project's scope, how to build images from the profiles and how to test.

AUTHORS.rst:
Add list of all direct contributors to the repository.

CONTRIBUTING.rst:
Add basic contribution guidelines, explaining the linter and the license in use.

Closes #7
Closes #3
---
 archiso/mkarchiso | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'archiso/mkarchiso')

diff --git a/archiso/mkarchiso b/archiso/mkarchiso
index 5e229a4..ad5232a 100755
--- a/archiso/mkarchiso
+++ b/archiso/mkarchiso
@@ -1,4 +1,6 @@
 #!/bin/bash
+#
+# SPDX-License-Identifier: GPL-3.0-or-later
 
 set -e -u
 
-- 
cgit v1.2.3-70-g09d2


From 945f3834c287bd06d33d4ac6c3b777e3df37dea7 Mon Sep 17 00:00:00 2001
From: nl6720 <nl6720@gmail.com>
Date: Thu, 30 Jul 2020 18:18:00 +0300
Subject: Show mksquashfs progress bar when mkarchiso is run in verbose mode

---
 archiso/mkarchiso | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'archiso/mkarchiso')

diff --git a/archiso/mkarchiso b/archiso/mkarchiso
index ad5232a..4e2a868 100755
--- a/archiso/mkarchiso
+++ b/archiso/mkarchiso
@@ -229,7 +229,7 @@ _mkairootfs_img () {
             -comp "${sfs_comp}" -no-progress &> /dev/null
     else
         mksquashfs "${work_dir}/airootfs.img" "${work_dir}/iso/${install_dir}/${arch}/airootfs.sfs" -noappend \
-            -comp "${sfs_comp}" -no-progress
+            -comp "${sfs_comp}"
     fi
     _msg_info "Done!"
     rm "${work_dir}/airootfs.img"
@@ -248,7 +248,7 @@ _mkairootfs_sfs () {
             -comp "${sfs_comp}" -no-progress &> /dev/null
     else
         mksquashfs "${work_dir}/airootfs" "${work_dir}/iso/${install_dir}/${arch}/airootfs.sfs" -noappend \
-            -comp "${sfs_comp}" -no-progress
+            -comp "${sfs_comp}"
     fi
     _msg_info "Done!"
 }
-- 
cgit v1.2.3-70-g09d2


From 6312ccc9bccb453c8506322581aa467538bc123f Mon Sep 17 00:00:00 2001
From: nl6720 <nl6720@gmail.com>
Date: Thu, 30 Jul 2020 18:36:21 +0300
Subject: Ensure all files in the ISO's Rock Ridge file system are owned by
 root

archiso/mkarchiso:
Add the -rational-rock option to xorriso.
This is a preparatory step for creating ISOs as a regular user. See https://gitlab.archlinux.org/archlinux/archiso/-/issues/40 .
---
 archiso/mkarchiso | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'archiso/mkarchiso')

diff --git a/archiso/mkarchiso b/archiso/mkarchiso
index 4e2a868..df7ee05 100755
--- a/archiso/mkarchiso
+++ b/archiso/mkarchiso
@@ -309,6 +309,7 @@ command_iso () {
         xorriso -as mkisofs -quiet \
             -iso-level 3 \
             -full-iso9660-filenames \
+            -rational-rock \
             -volid "${iso_label}" \
             -appid "${iso_application}" \
             -publisher "${iso_publisher}" \
@@ -324,6 +325,7 @@ command_iso () {
         xorriso -as mkisofs \
             -iso-level 3 \
             -full-iso9660-filenames \
+            -rational-rock \
             -volid "${iso_label}" \
             -appid "${iso_application}" \
             -publisher "${iso_publisher}" \
-- 
cgit v1.2.3-70-g09d2


From 0387b253c8ff90df30ad35883f710ddce3e04854 Mon Sep 17 00:00:00 2001
From: nl6720 <nl6720@gmail.com>
Date: Sat, 1 Aug 2020 14:51:11 +0300
Subject: archiso/mkarchiso: general bash improvements

Quote all variables.
Terminate option processing using '--' for commands that support it.
Do not hardcode file descriptor.
Compare integers with arithmetic comparison instead of string comparison.
Replace echo with printf.
Use heredoc for usage text.
Don't print INFO messages when quiet is set.
Export SOURCE_DATE_EPOCH.
---
 archiso/mkarchiso | 192 +++++++++++++++++++++++++++---------------------------
 1 file changed, 96 insertions(+), 96 deletions(-)

(limited to 'archiso/mkarchiso')

diff --git a/archiso/mkarchiso b/archiso/mkarchiso
index df7ee05..1dca307 100755
--- a/archiso/mkarchiso
+++ b/archiso/mkarchiso
@@ -4,10 +4,13 @@
 
 set -e -u
 
-export LANG=C
+# Control the environment
+umask 0022
+export LANG="C"
+export SOURCE_DATE_EPOCH="${SOURCE_DATE_EPOCH:-"$(date +%s)"}"
 
-app_name=${0##*/}
-arch=$(uname -m)
+app_name="${0##*/}"
+arch="$(uname -m)"
 pkg_list=()
 run_cmd=""
 quiet="y"
@@ -20,13 +23,14 @@ work_dir="work"
 out_dir="out"
 sfs_mode="sfs"
 sfs_comp="xz"
-gpg_key=
+gpg_key=""
 
 # Show an INFO message
 # $1: message string
 _msg_info() {
     local _msg="${1}"
-    echo "[mkarchiso] INFO: ${_msg}"
+    [[ "${quiet}" == "y" ]] || printf '[%s] INFO: %s\n' "${app_name}" "${_msg}"
+
 }
 
 # Show an ERROR message then exit with status
@@ -35,83 +39,83 @@ _msg_info() {
 _msg_error() {
     local _msg="${1}"
     local _error=${2}
-    echo
-    echo "[mkarchiso] ERROR: ${_msg}"
-    echo
-    if [[ ${_error} -gt 0 ]]; then
+    printf '\n[%s] ERROR: %s\n\n' "${app_name}" "${_msg}" >&2
+    if (( _error > 0 )); then
         exit "${_error}"
     fi
 }
 
 _chroot_init() {
-    mkdir -p ${work_dir}/airootfs
+    mkdir -p -- "${work_dir}/airootfs"
     _pacman base syslinux
 }
 
 _chroot_run() {
-    eval arch-chroot ${work_dir}/airootfs "${run_cmd}"
+    eval -- arch-chroot "${work_dir}/airootfs" "${run_cmd}"
 }
 
 _mount_airootfs() {
     trap "_umount_airootfs" EXIT HUP INT TERM
-    mkdir -p "${work_dir}/mnt/airootfs"
+    mkdir -p -- "${work_dir}/mnt/airootfs"
     _msg_info "Mounting '${work_dir}/airootfs.img' on '${work_dir}/mnt/airootfs'"
-    mount "${work_dir}/airootfs.img" "${work_dir}/mnt/airootfs"
+    mount -- "${work_dir}/airootfs.img" "${work_dir}/mnt/airootfs"
     _msg_info "Done!"
 }
 
 _umount_airootfs() {
     _msg_info "Unmounting '${work_dir}/mnt/airootfs'"
-    umount -d "${work_dir}/mnt/airootfs"
+    umount -d -- "${work_dir}/mnt/airootfs"
     _msg_info "Done!"
-    rmdir "${work_dir}/mnt/airootfs"
+    rmdir -- "${work_dir}/mnt/airootfs"
     trap - EXIT HUP INT TERM
 }
 
 # Show help usage, with an exit status.
 # $1: exit status number.
-_usage ()
-{
-    echo "usage ${app_name} [options] command <command options>"
-    echo " general options:"
-    echo "    -p PACKAGE(S)    Package(s) to install, can be used multiple times"
-    echo "    -r <command>     Run <command> inside airootfs"
-    echo "    -C <file>        Config file for pacman."
-    echo "                     Default: '${pacman_conf}'"
-    echo "    -L <label>       Set a label for the disk"
-    echo "                     Default: '${iso_label}'"
-    echo "    -P <publisher>   Set a publisher for the disk"
-    echo "                     Default: '${iso_publisher}'"
-    echo "    -A <application> Set an application name for the disk"
-    echo "                     Default: '${iso_application}'"
-    echo "    -D <install_dir> Set an install_dir. All files will by located here."
-    echo "                     Default: '${install_dir}'"
-    echo "                     NOTE: Max 8 characters, use only [a-z0-9]"
-    echo "    -w <work_dir>    Set the working directory"
-    echo "                     Default: '${work_dir}'"
-    echo "    -o <out_dir>     Set the output directory"
-    echo "                     Default: '${out_dir}'"
-    echo "    -s <sfs_mode>    Set SquashFS image mode (img or sfs)"
-    echo "                     img: prepare airootfs.sfs for dm-snapshot usage"
-    echo "                     sfs: prepare airootfs.sfs for overlayfs usage"
-    echo "                     Default: ${sfs_mode}"
-    echo "    -c <comp_type>   Set SquashFS compression type (gzip, lzma, lzo, xz, zstd)"
-    echo "                     Default: '${sfs_comp}'"
-    echo "    -v               Enable verbose output"
-    echo "    -h               This message"
-    echo " commands:"
-    echo "   init"
-    echo "      Make base layout and install base group"
-    echo "   install"
-    echo "      Install all specified packages (-p)"
-    echo "   run"
-    echo "      run command specified by -r"
-    echo "   prepare"
-    echo "      build all images"
-    echo "   pkglist"
-    echo "      make a pkglist.txt of packages installed on airootfs"
-    echo "   iso <image name>"
-    echo "      build an iso image from the working dir"
+_usage () {
+    IFS='' read -r -d '' usagetext <<ENDUSAGETEXT || true
+usage ${app_name} [options] command <command options>
+ general options:
+    -p PACKAGE(S)    Package(s) to install, can be used multiple times
+    -r <command>     Run <command> inside airootfs
+    -C <file>        Config file for pacman.
+                     Default: '${pacman_conf}'
+    -L <label>       Set a label for the disk
+                     Default: '${iso_label}'
+    -P <publisher>   Set a publisher for the disk
+                     Default: '${iso_publisher}'
+    -A <application> Set an application name for the disk
+                     Default: '${iso_application}'
+    -D <install_dir> Set an install_dir. All files will by located here.
+                     Default: '${install_dir}'
+                     NOTE: Max 8 characters, use only [a-z0-9]
+    -w <work_dir>    Set the working directory
+                     Default: '${work_dir}'
+    -o <out_dir>     Set the output directory
+                     Default: '${out_dir}'
+    -s <sfs_mode>    Set SquashFS image mode (img or sfs)
+                     img: prepare airootfs.sfs for dm-snapshot usage
+                     sfs: prepare airootfs.sfs for overlayfs usage
+                     Default: '${sfs_mode}'
+    -c <comp_type>   Set SquashFS compression type (gzip, lzma, lzo, xz, zstd)
+                     Default: '${sfs_comp}'
+    -v               Enable verbose output
+    -h               This message
+ commands:
+   init
+      Make base layout and install base group
+   install
+      Install all specified packages (-p)
+   run
+      run command specified by -r
+   prepare
+      build all images
+   pkglist
+      make a pkglist.txt of packages installed on airootfs
+   iso <image name>
+      build an iso image from the working dir
+ENDUSAGETEXT
+    printf '%s\n' "${usagetext}"
     exit "${1}"
 }
 
@@ -119,7 +123,7 @@ _usage ()
 # $1: init | install | run | prepare | iso
 _show_config () {
     local _mode="$1"
-    echo
+    printf '\n'
     _msg_info "Configuration settings"
     _msg_info "                  Command:   ${command_name}"
     _msg_info "             Architecture:   ${arch}"
@@ -147,18 +151,17 @@ _show_config () {
             _msg_info "         Disk application:   ${iso_application}"
             ;;
     esac
-    echo
+    printf '\n'
 }
 
 # Install desired packages to airootfs
-_pacman ()
-{
+_pacman () {
     _msg_info "Installing packages to '${work_dir}/airootfs/'..."
 
     if [[ "${quiet}" = "y" ]]; then
-        pacstrap -C "${pacman_conf}" -c -G -M "${work_dir}/airootfs" "$@" &> /dev/null
+        pacstrap -C "${pacman_conf}" -c -G -M -- "${work_dir}/airootfs" "$@" &> /dev/null
     else
-        pacstrap -C "${pacman_conf}" -c -G -M "${work_dir}/airootfs" "$@"
+        pacstrap -C "${pacman_conf}" -c -G -M -- "${work_dir}/airootfs" "$@"
     fi
 
     _msg_info "Packages installed successfully!"
@@ -197,7 +200,7 @@ _cleanup () {
         find "${work_dir}/airootfs/var/tmp" -mindepth 1 -delete
     fi
     # Delete package pacman related files.
-    find "${work_dir}" \( -name "*.pacnew" -o -name "*.pacsave" -o -name "*.pacorig" \) -delete
+    find "${work_dir}" \( -name '*.pacnew' -o -name '*.pacsave' -o -name '*.pacorig' \) -delete
     _msg_info "Done!"
 }
 
@@ -208,21 +211,21 @@ _mkairootfs_img () {
     fi
 
     _msg_info "Creating ext4 image of 32GiB..."
-    truncate -s 32G "${work_dir}/airootfs.img"
-    local _qflag=""
+    truncate -s 32G -- "${work_dir}/airootfs.img"
     if [[ "${quiet}" == "y" ]]; then
-        _qflag="-q"
+        mkfs.ext4 -q -O '^has_journal,^resize_inode' -E 'lazy_itable_init=0' -m 0 -F -- "${work_dir}/airootfs.img"
+    else
+        mkfs.ext4 -O '^has_journal,^resize_inode' -E 'lazy_itable_init=0' -m 0 -F -- "${work_dir}/airootfs.img"
     fi
-    mkfs.ext4 ${_qflag} -O ^has_journal,^resize_inode -E lazy_itable_init=0 -m 0 -F "${work_dir}/airootfs.img"
-    tune2fs -c 0 -i 0 "${work_dir}/airootfs.img" &> /dev/null
+    tune2fs -c 0 -i 0 -- "${work_dir}/airootfs.img" &> /dev/null
     _msg_info "Done!"
     _mount_airootfs
     _msg_info "Copying '${work_dir}/airootfs/' to '${work_dir}/mnt/airootfs/'..."
-    cp -aT "${work_dir}/airootfs/" "${work_dir}/mnt/airootfs/"
-    chown root:root "${work_dir}/mnt/airootfs/"
+    cp -aT -- "${work_dir}/airootfs/" "${work_dir}/mnt/airootfs/"
+    chown root:root -- "${work_dir}/mnt/airootfs/"
     _msg_info "Done!"
     _umount_airootfs
-    mkdir -p "${work_dir}/iso/${install_dir}/${arch}"
+    mkdir -p -- "${work_dir}/iso/${install_dir}/${arch}"
     _msg_info "Creating SquashFS image, this may take some time..."
     if [[ "${quiet}" = "y" ]]; then
         mksquashfs "${work_dir}/airootfs.img" "${work_dir}/iso/${install_dir}/${arch}/airootfs.sfs" -noappend \
@@ -232,7 +235,7 @@ _mkairootfs_img () {
             -comp "${sfs_comp}"
     fi
     _msg_info "Done!"
-    rm "${work_dir}/airootfs.img"
+    rm -- "${work_dir}/airootfs.img"
 }
 
 # Makes a SquashFS filesystem from a source directory.
@@ -241,7 +244,7 @@ _mkairootfs_sfs () {
         _msg_error "The path '${work_dir}/airootfs' does not exist" 1
     fi
 
-    mkdir -p "${work_dir}/iso/${install_dir}/${arch}"
+    mkdir -p -- "${work_dir}/iso/${install_dir}/${arch}"
     _msg_info "Creating SquashFS image, this may take some time..."
     if [[ "${quiet}" = "y" ]]; then
         mksquashfs "${work_dir}/airootfs" "${work_dir}/iso/${install_dir}/${arch}/airootfs.sfs" -noappend \
@@ -255,17 +258,17 @@ _mkairootfs_sfs () {
 
 _mkchecksum () {
     _msg_info "Creating checksum file for self-test..."
-    cd "${work_dir}/iso/${install_dir}/${arch}"
+    cd -- "${work_dir}/iso/${install_dir}/${arch}"
     sha512sum airootfs.sfs > airootfs.sha512
-    cd "${OLDPWD}"
+    cd -- "${OLDPWD}"
     _msg_info "Done!"
 }
 
 _mksignature () {
     _msg_info "Creating signature file..."
-    cd "${work_dir}/iso/${install_dir}/${arch}"
+    cd -- "${work_dir}/iso/${install_dir}/${arch}"
     gpg --detach-sign --default-key "${gpg_key}" airootfs.sfs
-    cd "${OLDPWD}"
+    cd -- "${OLDPWD}"
     _msg_info "Done!"
 }
 
@@ -273,8 +276,7 @@ command_pkglist () {
     _show_config pkglist
 
     _msg_info "Creating a list of installed packages on live-enviroment..."
-    pacman -Q --sysroot "${work_dir}/airootfs" > \
-        "${work_dir}/iso/${install_dir}/pkglist.${arch}.txt"
+    pacman -Q --sysroot "${work_dir}/airootfs" > "${work_dir}/iso/${install_dir}/pkglist.${arch}.txt"
     _msg_info "Done!"
 
 }
@@ -302,7 +304,7 @@ command_iso () {
 
     _show_config iso
 
-    mkdir -p "${out_dir}"
+    mkdir -p -- "${out_dir}"
     _msg_info "Creating ISO image..."
     local _qflag=""
     if [[ "${quiet}" == "y" ]]; then
@@ -313,7 +315,7 @@ command_iso () {
             -volid "${iso_label}" \
             -appid "${iso_application}" \
             -publisher "${iso_publisher}" \
-            -preparer "prepared by mkarchiso" \
+            -preparer "prepared by ${app_name}" \
             -eltorito-boot isolinux/isolinux.bin \
             -eltorito-catalog isolinux/boot.cat \
             -no-emul-boot -boot-load-size 4 -boot-info-table \
@@ -329,7 +331,7 @@ command_iso () {
             -volid "${iso_label}" \
             -appid "${iso_application}" \
             -publisher "${iso_publisher}" \
-            -preparer "prepared by mkarchiso" \
+            -preparer "prepared by ${app_name}" \
             -eltorito-boot isolinux/isolinux.bin \
             -eltorito-catalog isolinux/boot.cat \
             -no-emul-boot -boot-load-size 4 -boot-info-table \
@@ -338,7 +340,7 @@ command_iso () {
             -output "${out_dir}/${img_name}" \
             "${work_dir}/iso/"
     fi
-    _msg_info "Done! | $(ls -sh "${out_dir}/${img_name}")"
+    _msg_info "Done! | $(ls -sh -- "${out_dir}/${img_name}")"
 }
 
 # create airootfs.sfs filesystem, and push it in "iso" directory.
@@ -364,7 +366,7 @@ command_install () {
         _msg_error "Pacman config file '${pacman_conf}' does not exist" 1
     fi
 
-    if [[ "${#pkg_list[@]}" -eq 0 ]]; then
+    if (( ${#pkg_list[@]} == 0 )); then
         _msg_error "Packages must be specified" 0
         _usage 1
     fi
@@ -384,12 +386,6 @@ command_run() {
     _chroot_run
 }
 
-if [[ "${EUID}" -ne 0 ]]; then
-    _msg_error "This script must be run as root." 1
-fi
-
-umask 0022
-
 while getopts 'p:r:C:L:P:A:D:w:o:s:c:g:vh' arg; do
     case "${arg}" in
         p)
@@ -397,13 +393,13 @@ while getopts 'p:r:C:L:P:A:D:w:o:s:c:g:vh' arg; do
             pkg_list+=("${opt_pkg_list[@]}")
             ;;
         r) run_cmd="${OPTARG}" ;;
-        C) pacman_conf="${OPTARG}" ;;
+        C) pacman_conf="$(realpath -- "${OPTARG}")" ;;
         L) iso_label="${OPTARG}" ;;
         P) iso_publisher="${OPTARG}" ;;
         A) iso_application="${OPTARG}" ;;
         D) install_dir="${OPTARG}" ;;
-        w) work_dir="${OPTARG}" ;;
-        o) out_dir="${OPTARG}" ;;
+        w) work_dir="$(realpath -- "${OPTARG}")" ;;
+        o) out_dir="$(realpath -- "${OPTARG}")" ;;
         s) sfs_mode="${OPTARG}" ;;
         c) sfs_comp="${OPTARG}" ;;
         g) gpg_key="${OPTARG}" ;;
@@ -416,9 +412,13 @@ while getopts 'p:r:C:L:P:A:D:w:o:s:c:g:vh' arg; do
     esac
 done
 
+if (( EUID != 0 )); then
+    _msg_error "${app_name} must be run as root." 1
+fi
+
 shift $((OPTIND - 1))
 
-if [[ $# -lt 1 ]]; then
+if (( $# < 1 )); then
     _msg_error "No command specified" 0
     _usage 1
 fi
@@ -441,7 +441,7 @@ case "${command_name}" in
         command_pkglist
         ;;
     iso)
-        if [[ $# -lt 2 ]]; then
+        if (( $# < 2 )); then
             _msg_error "No image specified" 0
             _usage 1
         fi
-- 
cgit v1.2.3-70-g09d2


From 1cc7375c2576fe2cce6352e7e9c860a4b222d0ab Mon Sep 17 00:00:00 2001
From: nl6720 <nl6720@gmail.com>
Date: Fri, 14 Aug 2020 07:52:59 +0300
Subject: archiso/mkarchiso: start preparing a build_profile command

Nothing is implemented yet!

configs/releng/profiledef.sh:
A test profile.
---
 Makefile                     |   1 +
 archiso/mkarchiso            | 122 +++++++++++++++++++++++++++----------------
 configs/releng/profiledef.sh |  12 +++++
 3 files changed, 91 insertions(+), 44 deletions(-)
 create mode 100644 configs/releng/profiledef.sh

(limited to 'archiso/mkarchiso')

diff --git a/Makefile b/Makefile
index 573d044..2890026 100644
--- a/Makefile
+++ b/Makefile
@@ -23,6 +23,7 @@ lint:
 	                   scripts/run_archiso.sh \
 	                   $(INSTALL_FILES) \
 	                   $(wildcard configs/*/build.sh) \
+	                   $(wildcard configs/*/profiledef.sh) \
 	                   configs/releng/airootfs/root/.automated_script.sh \
 	                   configs/releng/airootfs/usr/local/bin/choose-mirror
 	shellcheck -s dash $(HOOKS_FILES) $(SCRIPT_FILES)
diff --git a/archiso/mkarchiso b/archiso/mkarchiso
index 1dca307..626fb6d 100755
--- a/archiso/mkarchiso
+++ b/archiso/mkarchiso
@@ -9,22 +9,31 @@ umask 0022
 export LANG="C"
 export SOURCE_DATE_EPOCH="${SOURCE_DATE_EPOCH:-"$(date +%s)"}"
 
+# mkarchiso defaults
 app_name="${0##*/}"
-arch="$(uname -m)"
 pkg_list=()
 run_cmd=""
 quiet="y"
-pacman_conf="/etc/pacman.conf"
-iso_label="ARCH_$(date +%Y%m)"
-iso_publisher="Arch Linux <http://www.archlinux.org>"
-iso_application="Arch Linux Live/Rescue CD"
-install_dir="arch"
 work_dir="work"
 out_dir="out"
+img_name="${app_name}.iso"
 sfs_mode="sfs"
 sfs_comp="xz"
 gpg_key=""
 
+# profile defaults
+profile=""
+iso_name="${app_name}"
+iso_label="${app_name^^}"
+iso_publisher="${app_name}"
+iso_application="${app_name} iso"
+iso_version=""
+install_dir="${app_name}"
+arch="$(uname -m)"
+pacman_conf="/etc/pacman.conf"
+bootmodes=()
+
+
 # Show an INFO message
 # $1: message string
 _msg_info() {
@@ -33,6 +42,13 @@ _msg_info() {
 
 }
 
+# Show a WARNING message
+# $1: message string
+_msg_warning() {
+    local _msg="${1}"
+    printf '\n[%s] WARNING: %s\n\n' "${app_name}" "${_msg}" >&2
+}
+
 # Show an ERROR message then exit with status
 # $1: message string
 # $2: exit code number (with 0 does not exit)
@@ -46,19 +62,19 @@ _msg_error() {
 }
 
 _chroot_init() {
-    mkdir -p -- "${work_dir}/airootfs"
+    mkdir -p -- "${airootfs_dir}"
     _pacman base syslinux
 }
 
 _chroot_run() {
-    eval -- arch-chroot "${work_dir}/airootfs" "${run_cmd}"
+    eval -- arch-chroot "${airootfs_dir}" "${run_cmd}"
 }
 
 _mount_airootfs() {
     trap "_umount_airootfs" EXIT HUP INT TERM
     mkdir -p -- "${work_dir}/mnt/airootfs"
-    _msg_info "Mounting '${work_dir}/airootfs.img' on '${work_dir}/mnt/airootfs'"
-    mount -- "${work_dir}/airootfs.img" "${work_dir}/mnt/airootfs"
+    _msg_info "Mounting '${airootfs_dir}.img' on '${work_dir}/mnt/airootfs'"
+    mount -- "${airootfs_dir}.img" "${work_dir}/mnt/airootfs"
     _msg_info "Done!"
 }
 
@@ -156,12 +172,12 @@ _show_config () {
 
 # Install desired packages to airootfs
 _pacman () {
-    _msg_info "Installing packages to '${work_dir}/airootfs/'..."
+    _msg_info "Installing packages to '${airootfs_dir}/'..."
 
     if [[ "${quiet}" = "y" ]]; then
-        pacstrap -C "${pacman_conf}" -c -G -M -- "${work_dir}/airootfs" "$@" &> /dev/null
+        pacstrap -C "${pacman_conf}" -c -G -M -- "${airootfs_dir}" "$@" &> /dev/null
     else
-        pacstrap -C "${pacman_conf}" -c -G -M -- "${work_dir}/airootfs" "$@"
+        pacstrap -C "${pacman_conf}" -c -G -M -- "${airootfs_dir}" "$@"
     fi
 
     _msg_info "Packages installed successfully!"
@@ -172,32 +188,32 @@ _cleanup () {
     _msg_info "Cleaning up what we can on airootfs..."
 
     # Delete initcpio image(s)
-    if [[ -d "${work_dir}/airootfs/boot" ]]; then
-        find "${work_dir}/airootfs/boot" -type f -name '*.img' -delete
+    if [[ -d "${airootfs_dir}/boot" ]]; then
+        find "${airootfs_dir}/boot" -type f -name '*.img' -delete
     fi
     # Delete kernel(s)
-    if [[ -d "${work_dir}/airootfs/boot" ]]; then
-        find "${work_dir}/airootfs/boot" -type f -name 'vmlinuz*' -delete
+    if [[ -d "${airootfs_dir}/boot" ]]; then
+        find "${airootfs_dir}/boot" -type f -name 'vmlinuz*' -delete
     fi
     # Delete pacman database sync cache files (*.tar.gz)
-    if [[ -d "${work_dir}/airootfs/var/lib/pacman" ]]; then
-        find "${work_dir}/airootfs/var/lib/pacman" -maxdepth 1 -type f -delete
+    if [[ -d "${airootfs_dir}/var/lib/pacman" ]]; then
+        find "${airootfs_dir}/var/lib/pacman" -maxdepth 1 -type f -delete
     fi
     # Delete pacman database sync cache
-    if [[ -d "${work_dir}/airootfs/var/lib/pacman/sync" ]]; then
-        find "${work_dir}/airootfs/var/lib/pacman/sync" -delete
+    if [[ -d "${airootfs_dir}/var/lib/pacman/sync" ]]; then
+        find "${airootfs_dir}/var/lib/pacman/sync" -delete
     fi
     # Delete pacman package cache
-    if [[ -d "${work_dir}/airootfs/var/cache/pacman/pkg" ]]; then
-        find "${work_dir}/airootfs/var/cache/pacman/pkg" -type f -delete
+    if [[ -d "${airootfs_dir}/var/cache/pacman/pkg" ]]; then
+        find "${airootfs_dir}/var/cache/pacman/pkg" -type f -delete
     fi
     # Delete all log files, keeps empty dirs.
-    if [[ -d "${work_dir}/airootfs/var/log" ]]; then
-        find "${work_dir}/airootfs/var/log" -type f -delete
+    if [[ -d "${airootfs_dir}/var/log" ]]; then
+        find "${airootfs_dir}/var/log" -type f -delete
     fi
     # Delete all temporary files and dirs
-    if [[ -d "${work_dir}/airootfs/var/tmp" ]]; then
-        find "${work_dir}/airootfs/var/tmp" -mindepth 1 -delete
+    if [[ -d "${airootfs_dir}/var/tmp" ]]; then
+        find "${airootfs_dir}/var/tmp" -mindepth 1 -delete
     fi
     # Delete package pacman related files.
     find "${work_dir}" \( -name '*.pacnew' -o -name '*.pacsave' -o -name '*.pacorig' \) -delete
@@ -206,51 +222,51 @@ _cleanup () {
 
 # Makes a ext4 filesystem inside a SquashFS from a source directory.
 _mkairootfs_img () {
-    if [[ ! -e "${work_dir}/airootfs" ]]; then
-        _msg_error "The path '${work_dir}/airootfs' does not exist" 1
+    if [[ ! -e "${airootfs_dir}" ]]; then
+        _msg_error "The path '${airootfs_dir}' does not exist" 1
     fi
 
     _msg_info "Creating ext4 image of 32GiB..."
-    truncate -s 32G -- "${work_dir}/airootfs.img"
+    truncate -s 32G -- "${airootfs_dir}.img"
     if [[ "${quiet}" == "y" ]]; then
-        mkfs.ext4 -q -O '^has_journal,^resize_inode' -E 'lazy_itable_init=0' -m 0 -F -- "${work_dir}/airootfs.img"
+        mkfs.ext4 -q -O '^has_journal,^resize_inode' -E 'lazy_itable_init=0' -m 0 -F -- "${airootfs_dir}.img"
     else
-        mkfs.ext4 -O '^has_journal,^resize_inode' -E 'lazy_itable_init=0' -m 0 -F -- "${work_dir}/airootfs.img"
+        mkfs.ext4 -O '^has_journal,^resize_inode' -E 'lazy_itable_init=0' -m 0 -F -- "${airootfs_dir}.img"
     fi
-    tune2fs -c 0 -i 0 -- "${work_dir}/airootfs.img" &> /dev/null
+    tune2fs -c 0 -i 0 -- "${airootfs_dir}.img" &> /dev/null
     _msg_info "Done!"
     _mount_airootfs
-    _msg_info "Copying '${work_dir}/airootfs/' to '${work_dir}/mnt/airootfs/'..."
-    cp -aT -- "${work_dir}/airootfs/" "${work_dir}/mnt/airootfs/"
+    _msg_info "Copying '${airootfs_dir}/' to '${work_dir}/mnt/airootfs/'..."
+    cp -aT -- "${airootfs_dir}/" "${work_dir}/mnt/airootfs/"
     chown root:root -- "${work_dir}/mnt/airootfs/"
     _msg_info "Done!"
     _umount_airootfs
     mkdir -p -- "${work_dir}/iso/${install_dir}/${arch}"
     _msg_info "Creating SquashFS image, this may take some time..."
     if [[ "${quiet}" = "y" ]]; then
-        mksquashfs "${work_dir}/airootfs.img" "${work_dir}/iso/${install_dir}/${arch}/airootfs.sfs" -noappend \
+        mksquashfs "${airootfs_dir}.img" "${work_dir}/iso/${install_dir}/${arch}/airootfs.sfs" -noappend \
             -comp "${sfs_comp}" -no-progress &> /dev/null
     else
-        mksquashfs "${work_dir}/airootfs.img" "${work_dir}/iso/${install_dir}/${arch}/airootfs.sfs" -noappend \
+        mksquashfs "${airootfs_dir}.img" "${work_dir}/iso/${install_dir}/${arch}/airootfs.sfs" -noappend \
             -comp "${sfs_comp}"
     fi
     _msg_info "Done!"
-    rm -- "${work_dir}/airootfs.img"
+    rm -- "${airootfs_dir}.img"
 }
 
 # Makes a SquashFS filesystem from a source directory.
 _mkairootfs_sfs () {
-    if [[ ! -e "${work_dir}/airootfs" ]]; then
-        _msg_error "The path '${work_dir}/airootfs' does not exist" 1
+    if [[ ! -e "${airootfs_dir}" ]]; then
+        _msg_error "The path '${airootfs_dir}' does not exist" 1
     fi
 
     mkdir -p -- "${work_dir}/iso/${install_dir}/${arch}"
     _msg_info "Creating SquashFS image, this may take some time..."
     if [[ "${quiet}" = "y" ]]; then
-        mksquashfs "${work_dir}/airootfs" "${work_dir}/iso/${install_dir}/${arch}/airootfs.sfs" -noappend \
+        mksquashfs "${airootfs_dir}" "${work_dir}/iso/${install_dir}/${arch}/airootfs.sfs" -noappend \
             -comp "${sfs_comp}" -no-progress &> /dev/null
     else
-        mksquashfs "${work_dir}/airootfs" "${work_dir}/iso/${install_dir}/${arch}/airootfs.sfs" -noappend \
+        mksquashfs "${airootfs_dir}" "${work_dir}/iso/${install_dir}/${arch}/airootfs.sfs" -noappend \
             -comp "${sfs_comp}"
     fi
     _msg_info "Done!"
@@ -272,11 +288,12 @@ _mksignature () {
     _msg_info "Done!"
 }
 
+
 command_pkglist () {
     _show_config pkglist
 
     _msg_info "Creating a list of installed packages on live-enviroment..."
-    pacman -Q --sysroot "${work_dir}/airootfs" > "${work_dir}/iso/${install_dir}/pkglist.${arch}.txt"
+    pacman -Q --sysroot "${airootfs_dir}" > "${work_dir}/iso/${install_dir}/pkglist.${arch}.txt"
     _msg_info "Done!"
 
 }
@@ -386,8 +403,19 @@ command_run() {
     _chroot_run
 }
 
-while getopts 'p:r:C:L:P:A:D:w:o:s:c:g:vh' arg; do
+command_build_profile() {
+    _msg_warning "The ${FUNCNAME[0]#command_} command is not fully implemented yet :("
+    # Set up essential directory paths
+    airootfs_dir="${work_dir}/${arch}/airootfs"
+
+    exit 1
+}
+
+while getopts 'B:p:r:C:L:P:A:D:w:o:s:c:g:vh' arg; do
     case "${arg}" in
+        B)
+            profile="$(realpath -- "${OPTARG}")"
+            ;;
         p)
             read -r -a opt_pkg_list <<< "${OPTARG}"
             pkg_list+=("${opt_pkg_list[@]}")
@@ -424,6 +452,9 @@ if (( $# < 1 )); then
 fi
 command_name="${1}"
 
+# Set directory path defaults
+airootfs_dir="${work_dir}/airootfs"
+
 case "${command_name}" in
     init)
         command_init
@@ -448,6 +479,9 @@ case "${command_name}" in
         img_name="${2}"
         command_iso
         ;;
+    build_profile)
+        command_build_profile
+        ;;
     *)
         _msg_error "Invalid command name '${command_name}'" 0
         _usage 1
diff --git a/configs/releng/profiledef.sh b/configs/releng/profiledef.sh
new file mode 100644
index 0000000..5eb5c5a
--- /dev/null
+++ b/configs/releng/profiledef.sh
@@ -0,0 +1,12 @@
+#!/usr/bin/env bash
+# shellcheck disable=SC2034
+
+iso_name="archlinux"
+iso_label="ARCH_$(date +%Y%m)"
+iso_publisher="Arch Linux <https://www.archlinux.org>"
+iso_application="Arch Linux Live/Rescue CD"
+iso_version="$(date +%Y.%m.%d)"
+install_dir="arch"
+bootmodes=()
+arch="x86_64"
+pacman_conf="pacman.conf"
-- 
cgit v1.2.3-70-g09d2


From 41b9b897469890ced3847e5545d5265995f21b64 Mon Sep 17 00:00:00 2001
From: nl6720 <nl6720@gmail.com>
Date: Sun, 2 Aug 2020 12:58:42 +0300
Subject: archiso/mkarchiso: copy make_* functions from configs/releng/build.sh

Adapt _make_* functions to mkarchiso.

Related to https://gitlab.archlinux.org/archlinux/archiso/-/issues/37 .
---
 archiso/mkarchiso | 350 +++++++++++++++++++++++++++++++++++++++++++++++++-----
 1 file changed, 318 insertions(+), 32 deletions(-)

(limited to 'archiso/mkarchiso')

diff --git a/archiso/mkarchiso b/archiso/mkarchiso
index 626fb6d..5769d14 100755
--- a/archiso/mkarchiso
+++ b/archiso/mkarchiso
@@ -241,13 +241,13 @@ _mkairootfs_img () {
     chown root:root -- "${work_dir}/mnt/airootfs/"
     _msg_info "Done!"
     _umount_airootfs
-    mkdir -p -- "${work_dir}/iso/${install_dir}/${arch}"
+    mkdir -p -- "${isofs_dir}/${install_dir}/${arch}"
     _msg_info "Creating SquashFS image, this may take some time..."
     if [[ "${quiet}" = "y" ]]; then
-        mksquashfs "${airootfs_dir}.img" "${work_dir}/iso/${install_dir}/${arch}/airootfs.sfs" -noappend \
+        mksquashfs "${airootfs_dir}.img" "${isofs_dir}/${install_dir}/${arch}/airootfs.sfs" -noappend \
             -comp "${sfs_comp}" -no-progress &> /dev/null
     else
-        mksquashfs "${airootfs_dir}.img" "${work_dir}/iso/${install_dir}/${arch}/airootfs.sfs" -noappend \
+        mksquashfs "${airootfs_dir}.img" "${isofs_dir}/${install_dir}/${arch}/airootfs.sfs" -noappend \
             -comp "${sfs_comp}"
     fi
     _msg_info "Done!"
@@ -260,13 +260,13 @@ _mkairootfs_sfs () {
         _msg_error "The path '${airootfs_dir}' does not exist" 1
     fi
 
-    mkdir -p -- "${work_dir}/iso/${install_dir}/${arch}"
+    mkdir -p -- "${isofs_dir}/${install_dir}/${arch}"
     _msg_info "Creating SquashFS image, this may take some time..."
     if [[ "${quiet}" = "y" ]]; then
-        mksquashfs "${airootfs_dir}" "${work_dir}/iso/${install_dir}/${arch}/airootfs.sfs" -noappend \
+        mksquashfs "${airootfs_dir}" "${isofs_dir}/${install_dir}/${arch}/airootfs.sfs" -noappend \
             -comp "${sfs_comp}" -no-progress &> /dev/null
     else
-        mksquashfs "${airootfs_dir}" "${work_dir}/iso/${install_dir}/${arch}/airootfs.sfs" -noappend \
+        mksquashfs "${airootfs_dir}" "${isofs_dir}/${install_dir}/${arch}/airootfs.sfs" -noappend \
             -comp "${sfs_comp}"
     fi
     _msg_info "Done!"
@@ -274,7 +274,7 @@ _mkairootfs_sfs () {
 
 _mkchecksum () {
     _msg_info "Creating checksum file for self-test..."
-    cd -- "${work_dir}/iso/${install_dir}/${arch}"
+    cd -- "${isofs_dir}/${install_dir}/${arch}"
     sha512sum airootfs.sfs > airootfs.sha512
     cd -- "${OLDPWD}"
     _msg_info "Done!"
@@ -282,35 +282,308 @@ _mkchecksum () {
 
 _mksignature () {
     _msg_info "Creating signature file..."
-    cd -- "${work_dir}/iso/${install_dir}/${arch}"
+    cd -- "${isofs_dir}/${install_dir}/${arch}"
     gpg --detach-sign --default-key "${gpg_key}" airootfs.sfs
     cd -- "${OLDPWD}"
     _msg_info "Done!"
 }
 
+# Helper function to run functions only one time.
+_run_once() {
+    if [[ ! -e "${work_dir}/build.${1}" ]]; then
+        "$1"
+        touch "${work_dir}/build.${1}"
+    fi
+}
 
-command_pkglist () {
-    _show_config pkglist
+# Set up custom pacman.conf with current cache directories.
+_make_pacman_conf() {
+    local _cache_dirs
+    _cache_dirs="$(pacman-conf CacheDir)"
+    sed -r "s|^#?\\s*CacheDir.+|CacheDir    = ${_cache_dirs[*]//$'\n'/ }|g" \
+        "${pacman_conf}" > "${work_dir}/pacman.conf"
+}
+
+# Prepare working directory and copy custom airootfs files (airootfs)
+_make_custom_airootfs() {
+    mkdir -m 755 -- "${airootfs_dir}"
+
+    local passwd=()
+    if [[ -d "${profile}/airootfs" ]]; then
+        cp -af --no-preserve=ownership -- "${profile}/airootfs/." "${airootfs_dir}"
+
+        [[ -e "${airootfs_dir}/etc/shadow" ]] && chmod -f 0400 -- "${airootfs_dir}/etc/shadow"
+        [[ -e "${airootfs_dir}/etc/gshadow" ]] && chmod -f 0400 -- "${airootfs_dir}/etc/gshadow"
+
+        # Set up user home directories and permissions
+        if [[ -e "${airootfs_dir}/etc/passwd" ]]; then
+            while IFS=':' read -a passwd -r; do
+                [[ "${passwd[5]}" == '/' ]] && continue
+                [[ -z "${passwd[5]}" ]] && continue
+
+                if [[ -d "${airootfs_dir}${passwd[5]}" ]]; then
+                    chown -hR -- "${passwd[2]}:${passwd[3]}" "${airootfs_dir}${passwd[5]}"
+                    chmod -f 0750 -- "${airootfs_dir}${passwd[5]}"
+                else
+                    install -d -m 0750 -o "${passwd[2]}" -g "${passwd[3]}" -- "${airootfs_dir}${passwd[5]}"
+                fi
+             done < "${airootfs_dir}/etc/passwd"
+        fi
+    fi
+}
+
+# Packages (airootfs)
+_make_packages() {
+    if [[ -n "${gpg_key}" ]]; then
+        exec {ARCHISO_GNUPG_FD}<>"${work_dir}/pubkey.gpg"
+        export ARCHISO_GNUPG_FD
+    fi
+    _pacman "${pkg_list[@]}"
+    if [[ -n "${gpg_key}" ]]; then
+        exec {ARCHISO_GNUPG_FD}<&-
+        unset ARCHISO_GNUPG_FD
+    fi
+}
+
+# Customize installation (airootfs)
+_make_customize_airootfs() {
+    local passwd=()
+    if [[ -e "${profile}/airootfs/etc/passwd" ]]; then
+        while IFS=':' read -a passwd -r; do
+            if [[ "${passwd[5]}" == '/' ]]; then
+                continue
+            fi
+            cp -RdT --preserve=mode,timestamps,links -- "${airootfs_dir}/etc/skel" "${airootfs_dir}${passwd[5]}"
+            chown -hR -- "${passwd[2]}:${passwd[3]}" "${airootfs_dir}${passwd[5]}"
+
+        done < "${profile}/airootfs/etc/passwd"
+    fi
+
+    if [[ -e "${airootfs_dir}/root/customize_airootfs.sh" ]]; then
+        _msg_warning "customize_airootfs.sh is deprecated! Support for it will be removed in a future archiso version."
+        local run_cmd="/root/customize_airootfs.sh"
+        local work_dir="${work_dir}/${arch}"
+        command_run
+        rm -- "${airootfs_dir}/root/customize_airootfs.sh"
+    fi
+}
+
+# Prepare kernel/initramfs ${install_dir}/boot/
+_make_boot() {
+    mkdir -p -- "${isofs_dir}/${install_dir}/boot/${arch}"
+    install -m 0644 -- "${airootfs_dir}/boot/archiso.img" "${isofs_dir}/${install_dir}/boot/${arch}/"
+    install -m 0644 -- "${airootfs_dir}/boot/vmlinuz-linux" "${isofs_dir}/${install_dir}/boot/${arch}/"
+}
+
+# Add other aditional/extra files to ${install_dir}/boot/
+_make_boot_extra() {
+    if [[ -e "${airootfs_dir}/boot/memtest86+/memtest.bin" ]]; then
+        # rename for PXE: https://wiki.archlinux.org/index.php/Syslinux#Using_memtest
+        install -m 0644 -- "${airootfs_dir}/boot/memtest86+/memtest.bin" "${isofs_dir}/${install_dir}/boot/memtest"
+        mkdir -p "${isofs_dir}/${install_dir}/boot/licenses/memtest86+/"
+        install -m 0644 -- "${airootfs_dir}/usr/share/licenses/common/GPL2/license.txt" \
+            "${isofs_dir}/${install_dir}/boot/licenses/memtest86+/"
+    fi
+    if [[ -e "${airootfs_dir}/boot/intel-ucode.img" ]]; then
+        install -m 0644 -- "${airootfs_dir}/boot/intel-ucode.img" "${isofs_dir}/${install_dir}/boot/"
+        mkdir -p "${isofs_dir}/${install_dir}/boot/licenses/intel-ucode/"
+        install -m 0644 -- "${airootfs_dir}/usr/share/licenses/intel-ucode/"* \
+            "${isofs_dir}/${install_dir}/boot/licenses/intel-ucode/"
+    fi
+    if [[ -e "${airootfs_dir}/boot/amd-ucode.img" ]]; then
+        install -m 0644 -- "${airootfs_dir}/boot/amd-ucode.img" "${isofs_dir}/${install_dir}/boot/"
+        mkdir -p "${isofs_dir}/${install_dir}/boot/licenses/amd-ucode/"
+        install -m 0644 -- "${airootfs_dir}/usr/share/licenses/amd-ucode/"* \
+            "${isofs_dir}/${install_dir}/boot/licenses/amd-ucode/"
+    fi
+}
+
+# Prepare /${install_dir}/boot/syslinux
+_make_syslinux() {
+    _uname_r=$(file -b "${airootfs_dir}/boot/vmlinuz-linux"| awk 'f{print;f=0} /version/{f=1}' RS=' ')
+    mkdir -p "${isofs_dir}/${install_dir}/boot/syslinux"
+    for _cfg in "${profile}/syslinux/"*.cfg; do
+        sed "s|%ARCHISO_LABEL%|${iso_label}|g;
+             s|%INSTALL_DIR%|${install_dir}|g" "${_cfg}" > "${isofs_dir}/${install_dir}/boot/syslinux/${_cfg##*/}"
+    done
+    install -m 0644 -- "${profile}/syslinux/splash.png" "${isofs_dir}/${install_dir}/boot/syslinux/"
+    install -m 0644 -- "${airootfs_dir}/usr/lib/syslinux/bios/"*.c32 "${isofs_dir}/${install_dir}/boot/syslinux/"
+    install -m 0644 -- "${airootfs_dir}/usr/lib/syslinux/bios/lpxelinux.0" "${isofs_dir}/${install_dir}/boot/syslinux/"
+    install -m 0644 -- "${airootfs_dir}/usr/lib/syslinux/bios/memdisk" "${isofs_dir}/${install_dir}/boot/syslinux/"
+    mkdir -p "${isofs_dir}/${install_dir}/boot/syslinux/hdt"
+    gzip -c -9 "${airootfs_dir}/usr/share/hwdata/pci.ids" > \
+        "${isofs_dir}/${install_dir}/boot/syslinux/hdt/pciids.gz"
+    gzip -c -9 "${airootfs_dir}/usr/lib/modules/${_uname_r}/modules.alias" > \
+        "${isofs_dir}/${install_dir}/boot/syslinux/hdt/modalias.gz"
+}
+
+# Prepare /isolinux
+_make_isolinux() {
+    mkdir -p "${isofs_dir}/isolinux"
+    sed "s|%INSTALL_DIR%|${install_dir}|g" \
+        "${profile}/isolinux/isolinux.cfg" > "${isofs_dir}/isolinux/isolinux.cfg"
+    install -m 0644 -- "${airootfs_dir}/usr/lib/syslinux/bios/isolinux.bin" "${isofs_dir}/isolinux/"
+    install -m 0644 -- "${airootfs_dir}/usr/lib/syslinux/bios/isohdpfx.bin" "${isofs_dir}/isolinux/"
+    install -m 0644 -- "${airootfs_dir}/usr/lib/syslinux/bios/ldlinux.c32" "${isofs_dir}/isolinux/"
+}
+
+# Prepare /EFI on ISO-9660
+_make_efi() {
+    mkdir -p "${isofs_dir}/EFI/BOOT"
+    install -m 0644 -- "${airootfs_dir}/usr/lib/systemd/boot/efi/systemd-bootx64.efi" \
+        "${isofs_dir}/EFI/BOOT/BOOTx64.EFI"
+
+    mkdir -p "${isofs_dir}/loader/entries"
+    install -m 0644 -- "${profile}/efiboot/loader/loader.conf" "${isofs_dir}/loader/"
+
+    sed "s|%ARCHISO_LABEL%|${iso_label}|g;
+         s|%INSTALL_DIR%|${install_dir}|g" \
+        "${profile}/efiboot/loader/entries/archiso-x86_64-usb.conf" > \
+        "${isofs_dir}/loader/entries/archiso-x86_64.conf"
+
+    # edk2-shell based UEFI shell
+    # shellx64.efi is picked up automatically when on /
+    install -m 0644 -- "${airootfs_dir}/usr/share/edk2-shell/x64/Shell_Full.efi" "${isofs_dir}/shellx64.efi"
+}
+
+# Prepare efiboot.img::/EFI for "El Torito" EFI boot mode
+_make_efiboot() {
+    mkdir -p "${isofs_dir}/EFI/archiso"
+    mkfs.fat -C -n ARCHISO_EFI "${isofs_dir}/EFI/archiso/efiboot.img" 65536
+
+    mkdir -p "${work_dir}/efiboot"
+    mount "${isofs_dir}/EFI/archiso/efiboot.img" "${work_dir}/efiboot"
+
+    mkdir -p "${work_dir}/efiboot/EFI/archiso"
+    install -m 0644 -- "${isofs_dir}/${install_dir}/boot/${arch}/vmlinuz-linux" "${work_dir}/efiboot/EFI/archiso/"
+    install -m 0644 -- "${isofs_dir}/${install_dir}/boot/${arch}/archiso.img" "${work_dir}/efiboot/EFI/archiso/"
+
+    install -m 0644 -- "${isofs_dir}/${install_dir}/boot/intel-ucode.img" "${work_dir}/efiboot/EFI/archiso/"
+    install -m 0644 -- "${isofs_dir}/${install_dir}/boot/amd-ucode.img" "${work_dir}/efiboot/EFI/archiso/"
+
+    mkdir -p "${work_dir}/efiboot/EFI/BOOT"
+    install -m 0644 -- "${airootfs_dir}/usr/lib/systemd/boot/efi/systemd-bootx64.efi" \
+        "${work_dir}/efiboot/EFI/BOOT/BOOTx64.EFI"
+
+    mkdir -p "${work_dir}/efiboot/loader/entries"
+    install -m 0644 -- "${profile}/efiboot/loader/loader.conf" "${work_dir}/efiboot/loader/"
+
+    sed "s|%ARCHISO_LABEL%|${iso_label}|g;
+         s|%INSTALL_DIR%|${install_dir}|g" \
+        "${profile}/efiboot/loader/entries/archiso-x86_64-cd.conf" > \
+        "${work_dir}/efiboot/loader/entries/archiso-x86_64.conf"
+
+    # shellx64.efi is picked up automatically when on /
+    install -m 0644 -- "${isofs_dir}/shellx64.efi" "${work_dir}/efiboot/"
 
+    umount -d "${work_dir}/efiboot"
+}
+
+# Build airootfs filesystem image
+_make_prepare() {
+    if [[ "${sfs_mode}" == "sfs" ]]; then
+        _mkairootfs_sfs
+    else
+        _mkairootfs_img
+    fi
+    _mkchecksum
+    if [[ "${gpg_key}" ]]; then
+      _mksignature
+    fi
+}
+
+# Build ISO
+_make_iso() {
+    command_iso "${iso_name}-${iso_version}-${arch}.iso"
+}
+
+# Read profile's values from profiledef.sh
+_read_profile () {
+    if [[ -z "${profile}" ]]; then
+        _msg_error "No profile specified!" 1
+    fi
+    if [[ ! -d "${profile}" ]]; then
+        _msg_error "Profile '${profile}' does not exist!" 1
+    elif [[ ! -e "${profile}/profiledef.sh" ]]; then
+        _msg_error "Profile '${profile}' is missing 'profiledef.sh'!" 1
+    else
+        # Source profile's variables
+        # shellcheck source=configs/releng/profiledef.sh
+        . "${profile}/profiledef.sh"
+        cd -- "${profile}"
+
+        # Resolve paths
+        packages="$(realpath -- "${profile}/packages.${arch}")"
+        pacman_conf="$(realpath -- "${pacman_conf}")"
+
+        # Enumerate packages
+        [[ -e "${packages}" ]] || _msg_error "File '${packages}' does not exist!" 1
+        mapfile -t pkg_list < <(sed '/^[[:blank:]]*#.*/d;s/#.*//;/^[[:blank:]]*$/d' "${packages}")
+        if (( ${#pkg_list[@]} == 0 )); then
+            _msg_error "'${packages}' does not list any packages!" 1
+        fi
+
+        cd -- "${OLDPWD}"
+    fi
+}
+
+_set_up_directories() {
+    local directory
+    for directory in "${work_dir}" "${out_dir}" "${work_dir}/${arch}" "${isofs_dir}" "${isofs_dir}/${install_dir}"; do
+        [[ -d "${directory}" ]] || mkdir -m 0755 -- "${directory}"
+    done
+}
+
+_print_settings() {
+    _msg_info "${app_name} configuration settings"
+    _msg_info "    Command:                   ${command_name}"
+    _msg_info "    Working directory:         ${work_dir}"
+    _msg_info "    Output directory:          ${out_dir}"
+    _msg_info "    GPG key:                   ${gpg_key:-None}"
+    _msg_info "Profile configuration settings"
+    _msg_info "    Profile:                   ${profile}"
+    _msg_info "    Architecture:              ${arch}"
+    _msg_info "    Image name:                ${img_name}"
+    _msg_info "    Disk label:                ${iso_label}"
+    _msg_info "    Disk publisher:            ${iso_publisher}"
+    _msg_info "    Disk application:          ${iso_application}"
+    _msg_info "    Installation directory:    ${install_dir}"
+    _msg_info "    Pacman config file:        ${pacman_conf}"
+    _msg_info "    Packages:                  ${pkg_list[*]}"
+    _msg_info "    Boot modes:                ${bootmodes[*]}"
+}
+
+_export_gpg_publickey() {
+    if [[ -n "${gpg_key}" ]]; then
+        gpg --batch --output "${work_dir}/pubkey.gpg" --export "${gpg_key}"
+    fi
+}
+
+
+_make_pkglist() {
     _msg_info "Creating a list of installed packages on live-enviroment..."
-    pacman -Q --sysroot "${airootfs_dir}" > "${work_dir}/iso/${install_dir}/pkglist.${arch}.txt"
+    pacman -Q --sysroot "${airootfs_dir}" > "${isofs_dir}/${install_dir}/pkglist.${arch}.txt"
     _msg_info "Done!"
+}
 
+command_pkglist () {
+    _show_config pkglist
+    _make_pkglist
 }
 
 # Create an ISO9660 filesystem from "iso" directory.
 command_iso () {
     local _iso_efi_boot_args=()
 
-    if [[ ! -f "${work_dir}/iso/isolinux/isolinux.bin" ]]; then
-         _msg_error "The file '${work_dir}/iso/isolinux/isolinux.bin' does not exist." 1
+    if [[ ! -f "${isofs_dir}/isolinux/isolinux.bin" ]]; then
+         _msg_error "The file '${isofs_dir}/isolinux/isolinux.bin' does not exist." 1
     fi
-    if [[ ! -f "${work_dir}/iso/isolinux/isohdpfx.bin" ]]; then
-         _msg_error "The file '${work_dir}/iso/isolinux/isohdpfx.bin' does not exist." 1
+    if [[ ! -f "${isofs_dir}/isolinux/isohdpfx.bin" ]]; then
+         _msg_error "The file '${isofs_dir}/isolinux/isohdpfx.bin' does not exist." 1
     fi
 
     # If exists, add an EFI "El Torito" boot image (FAT filesystem) to ISO-9660 image.
-    if [[ -f "${work_dir}/iso/EFI/archiso/efiboot.img" ]]; then
+    if [[ -f "${isofs_dir}/EFI/archiso/efiboot.img" ]]; then
         _iso_efi_boot_args+=(
             '-eltorito-alt-boot'
             '-e' 'EFI/archiso/efiboot.img'
@@ -336,10 +609,10 @@ command_iso () {
             -eltorito-boot isolinux/isolinux.bin \
             -eltorito-catalog isolinux/boot.cat \
             -no-emul-boot -boot-load-size 4 -boot-info-table \
-            -isohybrid-mbr "${work_dir}/iso/isolinux/isohdpfx.bin" \
+            -isohybrid-mbr "${isofs_dir}/isolinux/isohdpfx.bin" \
             "${_iso_efi_boot_args[@]}" \
             -output "${out_dir}/${img_name}" \
-            "${work_dir}/iso/"
+            "${isofs_dir}/"
     else
         xorriso -as mkisofs \
             -iso-level 3 \
@@ -352,10 +625,10 @@ command_iso () {
             -eltorito-boot isolinux/isolinux.bin \
             -eltorito-catalog isolinux/boot.cat \
             -no-emul-boot -boot-load-size 4 -boot-info-table \
-            -isohybrid-mbr "${work_dir}/iso/isolinux/isohdpfx.bin" \
+            -isohybrid-mbr "${isofs_dir}/isolinux/isohdpfx.bin" \
             "${_iso_efi_boot_args[@]}" \
             -output "${out_dir}/${img_name}" \
-            "${work_dir}/iso/"
+            "${isofs_dir}/"
     fi
     _msg_info "Done! | $(ls -sh -- "${out_dir}/${img_name}")"
 }
@@ -365,15 +638,7 @@ command_prepare () {
     _show_config prepare
 
     _cleanup
-    if [[ "${sfs_mode}" == "sfs" ]]; then
-        _mkairootfs_sfs
-    else
-        _mkairootfs_img
-    fi
-    _mkchecksum
-    if [[ "${gpg_key}" ]]; then
-      _mksignature
-    fi
+    _make_prepare
 }
 
 # Install packages on airootfs.
@@ -390,7 +655,7 @@ command_install () {
 
     _show_config install
 
-    _pacman "${pkg_list[@]}"
+    _make_packages
 }
 
 command_init() {
@@ -407,14 +672,34 @@ command_build_profile() {
     _msg_warning "The ${FUNCNAME[0]#command_} command is not fully implemented yet :("
     # Set up essential directory paths
     airootfs_dir="${work_dir}/${arch}/airootfs"
-
-    exit 1
+    isofs_dir="${work_dir}/iso"
+    # Set ISO file name
+    img_name="${iso_name}-${iso_version}-${arch}.iso"
+
+    _print_settings
+    _run_once _set_up_directories
+    _run_once _make_pacman_conf
+    _run_once _export_gpg_publickey
+    _run_once _make_custom_airootfs
+    _run_once _make_packages
+    _run_once _make_customize_airootfs
+    _run_once _make_pkglist
+    _run_once _make_boot
+    _run_once _make_boot_extra
+    _run_once _make_syslinux
+    _run_once _make_isolinux
+    _run_once _make_efi
+    _run_once _make_efiboot
+    _run_once _cleanup
+    _run_once _make_prepare
+    _run_once _make_iso
 }
 
 while getopts 'B:p:r:C:L:P:A:D:w:o:s:c:g:vh' arg; do
     case "${arg}" in
         B)
             profile="$(realpath -- "${OPTARG}")"
+            _read_profile
             ;;
         p)
             read -r -a opt_pkg_list <<< "${OPTARG}"
@@ -454,6 +739,7 @@ command_name="${1}"
 
 # Set directory path defaults
 airootfs_dir="${work_dir}/airootfs"
+isofs_dir="${work_dir}/iso"
 
 case "${command_name}" in
     init)
-- 
cgit v1.2.3-70-g09d2


From 7c2247f615ecdff8d236ac90c4bec1c3d255a497 Mon Sep 17 00:00:00 2001
From: nl6720 <nl6720@gmail.com>
Date: Wed, 12 Aug 2020 19:42:02 +0300
Subject: archiso/mkarchiso: allow choosing boot modes from profiledef.sh

Boot mode names are:

- bios_syslinux.mbr: SYSLINUX in MBR
- bios.syslinux.eltorito: SYSLINUX (ISOLINUX) via El Torito
- uefi-x64.systemd-boot.esp: systemd-boot on ESP in MBR
- uefi-x64.systemd-boot.eltorito: systemd-boot on ESP via El Torito

It is not yet possible to create an ISO with only El Torito or only MBR boot modes!
---
 archiso/mkarchiso              | 213 ++++++++++++++++++++++++-----------------
 configs/baseline/profiledef.sh |  12 +++
 configs/releng/profiledef.sh   |   2 +-
 3 files changed, 136 insertions(+), 91 deletions(-)
 create mode 100644 configs/baseline/profiledef.sh

(limited to 'archiso/mkarchiso')

diff --git a/archiso/mkarchiso b/archiso/mkarchiso
index 5769d14..c2b6f24 100755
--- a/archiso/mkarchiso
+++ b/archiso/mkarchiso
@@ -368,22 +368,23 @@ _make_customize_airootfs() {
     fi
 }
 
+# Set up boot loaders
+_make_bootmodes() {
+    local bootmode
+    for bootmode in "${bootmodes[@]}"; do
+        if typeset -f "_make_boot_${bootmode}" &> /dev/null; then
+            _run_once "_make_boot_${bootmode}"
+        else
+            _msg_error "${bootmode} is not a valid boot mode" 1
+        fi
+    done
+}
+
 # Prepare kernel/initramfs ${install_dir}/boot/
-_make_boot() {
+_make_boot_on_iso() {
     mkdir -p -- "${isofs_dir}/${install_dir}/boot/${arch}"
     install -m 0644 -- "${airootfs_dir}/boot/archiso.img" "${isofs_dir}/${install_dir}/boot/${arch}/"
     install -m 0644 -- "${airootfs_dir}/boot/vmlinuz-linux" "${isofs_dir}/${install_dir}/boot/${arch}/"
-}
-
-# Add other aditional/extra files to ${install_dir}/boot/
-_make_boot_extra() {
-    if [[ -e "${airootfs_dir}/boot/memtest86+/memtest.bin" ]]; then
-        # rename for PXE: https://wiki.archlinux.org/index.php/Syslinux#Using_memtest
-        install -m 0644 -- "${airootfs_dir}/boot/memtest86+/memtest.bin" "${isofs_dir}/${install_dir}/boot/memtest"
-        mkdir -p "${isofs_dir}/${install_dir}/boot/licenses/memtest86+/"
-        install -m 0644 -- "${airootfs_dir}/usr/share/licenses/common/GPL2/license.txt" \
-            "${isofs_dir}/${install_dir}/boot/licenses/memtest86+/"
-    fi
     if [[ -e "${airootfs_dir}/boot/intel-ucode.img" ]]; then
         install -m 0644 -- "${airootfs_dir}/boot/intel-ucode.img" "${isofs_dir}/${install_dir}/boot/"
         mkdir -p "${isofs_dir}/${install_dir}/boot/licenses/intel-ucode/"
@@ -399,32 +400,53 @@ _make_boot_extra() {
 }
 
 # Prepare /${install_dir}/boot/syslinux
-_make_syslinux() {
-    _uname_r=$(file -b "${airootfs_dir}/boot/vmlinuz-linux"| awk 'f{print;f=0} /version/{f=1}' RS=' ')
+_make_boot_bios.syslinux.mbr() {
     mkdir -p "${isofs_dir}/${install_dir}/boot/syslinux"
     for _cfg in "${profile}/syslinux/"*.cfg; do
         sed "s|%ARCHISO_LABEL%|${iso_label}|g;
-             s|%INSTALL_DIR%|${install_dir}|g" "${_cfg}" > "${isofs_dir}/${install_dir}/boot/syslinux/${_cfg##*/}"
+             s|%INSTALL_DIR%|${install_dir}|g;
+             s|%ARCH%|${arch}|g" \
+             "${_cfg}" > "${isofs_dir}/${install_dir}/boot/syslinux/${_cfg##*/}"
     done
-    install -m 0644 -- "${profile}/syslinux/splash.png" "${isofs_dir}/${install_dir}/boot/syslinux/"
+    if [[ -e "${profile}/syslinux/splash.png" ]]; then
+        install -m 0644 -- "${profile}/syslinux/splash.png" "${isofs_dir}/${install_dir}/boot/syslinux/"
+    fi
     install -m 0644 -- "${airootfs_dir}/usr/lib/syslinux/bios/"*.c32 "${isofs_dir}/${install_dir}/boot/syslinux/"
     install -m 0644 -- "${airootfs_dir}/usr/lib/syslinux/bios/lpxelinux.0" "${isofs_dir}/${install_dir}/boot/syslinux/"
     install -m 0644 -- "${airootfs_dir}/usr/lib/syslinux/bios/memdisk" "${isofs_dir}/${install_dir}/boot/syslinux/"
+
+    _make_boot_on_iso
+    _uname_r=$(file -b "${isofs_dir}/${install_dir}/boot/${arch}/vmlinuz-linux" | awk 'f{print;f=0} /version/{f=1}' RS=' ')
+
     mkdir -p "${isofs_dir}/${install_dir}/boot/syslinux/hdt"
     gzip -c -9 "${airootfs_dir}/usr/share/hwdata/pci.ids" > \
         "${isofs_dir}/${install_dir}/boot/syslinux/hdt/pciids.gz"
     gzip -c -9 "${airootfs_dir}/usr/lib/modules/${_uname_r}/modules.alias" > \
         "${isofs_dir}/${install_dir}/boot/syslinux/hdt/modalias.gz"
+
+    # Add other aditional/extra files to ${install_dir}/boot/
+    if [[ -e "${airootfs_dir}/boot/memtest86+/memtest.bin" ]]; then
+        # rename for PXE: https://wiki.archlinux.org/index.php/Syslinux#Using_memtest
+        install -m 0644 -- "${airootfs_dir}/boot/memtest86+/memtest.bin" "${isofs_dir}/${install_dir}/boot/memtest"
+        mkdir -p "${isofs_dir}/${install_dir}/boot/licenses/memtest86+/"
+        install -m 0644 -- "${airootfs_dir}/usr/share/licenses/common/GPL2/license.txt" \
+            "${isofs_dir}/${install_dir}/boot/licenses/memtest86+/"
+    fi
 }
 
 # Prepare /isolinux
-_make_isolinux() {
+_make_boot_bios.syslinux.eltorito() {
     mkdir -p "${isofs_dir}/isolinux"
-    sed "s|%INSTALL_DIR%|${install_dir}|g" \
-        "${profile}/isolinux/isolinux.cfg" > "${isofs_dir}/isolinux/isolinux.cfg"
+    sed "s|%ARCHISO_LABEL%|${iso_label}|g;
+         s|%INSTALL_DIR%|${install_dir}|g;
+         s|%ARCH%|${arch}|g" \
+         "${profile}/isolinux/isolinux.cfg" > "${isofs_dir}/isolinux/isolinux.cfg"
     install -m 0644 -- "${airootfs_dir}/usr/lib/syslinux/bios/isolinux.bin" "${isofs_dir}/isolinux/"
     install -m 0644 -- "${airootfs_dir}/usr/lib/syslinux/bios/isohdpfx.bin" "${isofs_dir}/isolinux/"
     install -m 0644 -- "${airootfs_dir}/usr/lib/syslinux/bios/ldlinux.c32" "${isofs_dir}/isolinux/"
+
+    # isolinux.cfg loads syslinux.cfg
+    _run_once _make_boot_bios.syslinux.mbr
 }
 
 # Prepare /EFI on ISO-9660
@@ -437,30 +459,39 @@ _make_efi() {
     install -m 0644 -- "${profile}/efiboot/loader/loader.conf" "${isofs_dir}/loader/"
 
     sed "s|%ARCHISO_LABEL%|${iso_label}|g;
-         s|%INSTALL_DIR%|${install_dir}|g" \
+         s|%INSTALL_DIR%|${install_dir}|g;
+         s|%ARCH%|${arch}|g" \
         "${profile}/efiboot/loader/entries/archiso-x86_64-usb.conf" > \
         "${isofs_dir}/loader/entries/archiso-x86_64.conf"
 
     # edk2-shell based UEFI shell
     # shellx64.efi is picked up automatically when on /
-    install -m 0644 -- "${airootfs_dir}/usr/share/edk2-shell/x64/Shell_Full.efi" "${isofs_dir}/shellx64.efi"
+    if [[ -e "${airootfs_dir}/usr/share/edk2-shell/x64/Shell_Full.efi" ]]; then
+        install -m 0644 -- "${airootfs_dir}/usr/share/edk2-shell/x64/Shell_Full.efi" "${isofs_dir}/shellx64.efi"
+    fi
 }
 
-# Prepare efiboot.img::/EFI for "El Torito" EFI boot mode
-_make_efiboot() {
+# Prepare kernel/initramfs on efiboot.img
+_make_boot_on_fat() {
+    mkdir -p "${work_dir}/efiboot/EFI/archiso"
+    install -m 0644 -- "${airootfs_dir}/boot/vmlinuz-linux" "${work_dir}/efiboot/EFI/archiso/"
+    install -m 0644 -- "${isofs_dir}/${install_dir}/boot/${arch}/archiso.img" "${work_dir}/efiboot/EFI/archiso/"
+    if [[ -e "${airootfs_dir}/boot/intel-ucode.img" ]]; then
+        install -m 0644 -- "${airootfs_dir}/boot/intel-ucode.img" "${work_dir}/efiboot/EFI/archiso/"
+    fi
+    if [[ -e "${airootfs_dir}/boot/amd-ucode.img" ]]; then
+        install -m 0644 -- "${airootfs_dir}/boot/amd-ucode.img" "${work_dir}/efiboot/EFI/archiso/"
+    fi
+}
+
+# Prepare efiboot.img::/EFI for EFI boot mode
+_make_boot_uefi-x64.systemd-boot.esp() {
     mkdir -p "${isofs_dir}/EFI/archiso"
     mkfs.fat -C -n ARCHISO_EFI "${isofs_dir}/EFI/archiso/efiboot.img" 65536
 
     mkdir -p "${work_dir}/efiboot"
     mount "${isofs_dir}/EFI/archiso/efiboot.img" "${work_dir}/efiboot"
 
-    mkdir -p "${work_dir}/efiboot/EFI/archiso"
-    install -m 0644 -- "${isofs_dir}/${install_dir}/boot/${arch}/vmlinuz-linux" "${work_dir}/efiboot/EFI/archiso/"
-    install -m 0644 -- "${isofs_dir}/${install_dir}/boot/${arch}/archiso.img" "${work_dir}/efiboot/EFI/archiso/"
-
-    install -m 0644 -- "${isofs_dir}/${install_dir}/boot/intel-ucode.img" "${work_dir}/efiboot/EFI/archiso/"
-    install -m 0644 -- "${isofs_dir}/${install_dir}/boot/amd-ucode.img" "${work_dir}/efiboot/EFI/archiso/"
-
     mkdir -p "${work_dir}/efiboot/EFI/BOOT"
     install -m 0644 -- "${airootfs_dir}/usr/lib/systemd/boot/efi/systemd-bootx64.efi" \
         "${work_dir}/efiboot/EFI/BOOT/BOOTx64.EFI"
@@ -469,16 +500,29 @@ _make_efiboot() {
     install -m 0644 -- "${profile}/efiboot/loader/loader.conf" "${work_dir}/efiboot/loader/"
 
     sed "s|%ARCHISO_LABEL%|${iso_label}|g;
-         s|%INSTALL_DIR%|${install_dir}|g" \
+         s|%INSTALL_DIR%|${install_dir}|g;
+         s|%ARCH%|${arch}|g" \
         "${profile}/efiboot/loader/entries/archiso-x86_64-cd.conf" > \
         "${work_dir}/efiboot/loader/entries/archiso-x86_64.conf"
 
     # shellx64.efi is picked up automatically when on /
-    install -m 0644 -- "${isofs_dir}/shellx64.efi" "${work_dir}/efiboot/"
+    if [[ -e "${airootfs_dir}/usr/share/edk2-shell/x64/Shell_Full.efi" ]]; then
+        install -m 0644 -- "${airootfs_dir}/usr/share/edk2-shell/x64/Shell_Full.efi" "${work_dir}/efiboot/shellx64.efi"
+    fi
+
+    # Copy kernel and initramfs
+    _make_boot_on_fat
 
     umount -d "${work_dir}/efiboot"
 }
 
+# Prepare efiboot.img::/EFI for "El Torito" EFI boot mode
+_make_boot_uefi-x64.systemd-boot.eltorito() {
+    _run_once _make_boot_uefi-x64.systemd-boot.esp
+    # Set up /EFI on ISO-9660
+    _run_once _make_efi
+}
+
 # Build airootfs filesystem image
 _make_prepare() {
     if [[ "${sfs_mode}" == "sfs" ]]; then
@@ -494,7 +538,49 @@ _make_prepare() {
 
 # Build ISO
 _make_iso() {
-    command_iso "${iso_name}-${iso_version}-${arch}.iso"
+    local xorrisofs_options=()
+
+    if [[ "${quiet}" == "y" ]]; then
+        xorrisofs_options+=('-quiet')
+    fi
+    # shellcheck disable=SC2076
+    if [[ " ${bootmodes[*]} " =~ ' bios.syslinux.' ]]; then
+        if [[ ! -f "${isofs_dir}/isolinux/isolinux.bin" ]]; then
+            _msg_error "The file '${isofs_dir}/isolinux/isolinux.bin' does not exist." 1
+        fi
+        if [[ ! -f "${isofs_dir}/isolinux/isohdpfx.bin" ]]; then
+            _msg_error "The file '${isofs_dir}/isolinux/isohdpfx.bin' does not exist." 1
+        fi
+        xorrisofs_options+=(
+            '-eltorito-boot' 'isolinux/isolinux.bin'
+            '-eltorito-catalog' 'isolinux/boot.cat'
+            '-no-emul-boot' '-boot-load-size' '4' '-boot-info-table'
+            '-isohybrid-mbr' "${isofs_dir}/isolinux/isohdpfx.bin"
+        )
+    fi
+    # shellcheck disable=SC2076
+    if [[ " ${bootmodes[*]} " =~ ' uefi-x64.systemd-boot.' ]]; then
+        xorrisofs_options+=(
+            '-eltorito-alt-boot'
+            '-e' 'EFI/archiso/efiboot.img'
+            '-no-emul-boot'
+            '-isohybrid-gpt-basdat'
+        )
+    fi
+
+    _msg_info "Creating ISO image..."
+    xorriso -as mkisofs \
+            -iso-level 3 \
+            -full-iso9660-filenames \
+            -rational-rock \
+            -volid "${iso_label}" \
+            -appid "${iso_application}" \
+            -publisher "${iso_publisher}" \
+            -preparer "prepared by ${app_name}" \
+            "${xorrisofs_options[@]}" \
+            -output "${out_dir}/${img_name}" \
+            "${isofs_dir}/"
+    _msg_info "Done! | $(du -h -- "${out_dir}/${img_name}")"
 }
 
 # Read profile's values from profiledef.sh
@@ -573,64 +659,16 @@ command_pkglist () {
 
 # Create an ISO9660 filesystem from "iso" directory.
 command_iso () {
-    local _iso_efi_boot_args=()
-
-    if [[ ! -f "${isofs_dir}/isolinux/isolinux.bin" ]]; then
-         _msg_error "The file '${isofs_dir}/isolinux/isolinux.bin' does not exist." 1
-    fi
-    if [[ ! -f "${isofs_dir}/isolinux/isohdpfx.bin" ]]; then
-         _msg_error "The file '${isofs_dir}/isolinux/isohdpfx.bin' does not exist." 1
-    fi
+    bootmodes=('bios.syslinux.mbr' 'bios.syslinux.eltorito')
 
     # If exists, add an EFI "El Torito" boot image (FAT filesystem) to ISO-9660 image.
     if [[ -f "${isofs_dir}/EFI/archiso/efiboot.img" ]]; then
-        _iso_efi_boot_args+=(
-            '-eltorito-alt-boot'
-            '-e' 'EFI/archiso/efiboot.img'
-            '-no-emul-boot'
-            '-isohybrid-gpt-basdat'
-        )
+        bootmodes+=('uefi-x64.systemd-boot.esp' 'uefi-x64.systemd-boot.eltorito')
     fi
 
     _show_config iso
-
     mkdir -p -- "${out_dir}"
-    _msg_info "Creating ISO image..."
-    local _qflag=""
-    if [[ "${quiet}" == "y" ]]; then
-        xorriso -as mkisofs -quiet \
-            -iso-level 3 \
-            -full-iso9660-filenames \
-            -rational-rock \
-            -volid "${iso_label}" \
-            -appid "${iso_application}" \
-            -publisher "${iso_publisher}" \
-            -preparer "prepared by ${app_name}" \
-            -eltorito-boot isolinux/isolinux.bin \
-            -eltorito-catalog isolinux/boot.cat \
-            -no-emul-boot -boot-load-size 4 -boot-info-table \
-            -isohybrid-mbr "${isofs_dir}/isolinux/isohdpfx.bin" \
-            "${_iso_efi_boot_args[@]}" \
-            -output "${out_dir}/${img_name}" \
-            "${isofs_dir}/"
-    else
-        xorriso -as mkisofs \
-            -iso-level 3 \
-            -full-iso9660-filenames \
-            -rational-rock \
-            -volid "${iso_label}" \
-            -appid "${iso_application}" \
-            -publisher "${iso_publisher}" \
-            -preparer "prepared by ${app_name}" \
-            -eltorito-boot isolinux/isolinux.bin \
-            -eltorito-catalog isolinux/boot.cat \
-            -no-emul-boot -boot-load-size 4 -boot-info-table \
-            -isohybrid-mbr "${isofs_dir}/isolinux/isohdpfx.bin" \
-            "${_iso_efi_boot_args[@]}" \
-            -output "${out_dir}/${img_name}" \
-            "${isofs_dir}/"
-    fi
-    _msg_info "Done! | $(ls -sh -- "${out_dir}/${img_name}")"
+    _make_iso
 }
 
 # create airootfs.sfs filesystem, and push it in "iso" directory.
@@ -684,12 +722,7 @@ command_build_profile() {
     _run_once _make_packages
     _run_once _make_customize_airootfs
     _run_once _make_pkglist
-    _run_once _make_boot
-    _run_once _make_boot_extra
-    _run_once _make_syslinux
-    _run_once _make_isolinux
-    _run_once _make_efi
-    _run_once _make_efiboot
+    _make_bootmodes
     _run_once _cleanup
     _run_once _make_prepare
     _run_once _make_iso
diff --git a/configs/baseline/profiledef.sh b/configs/baseline/profiledef.sh
new file mode 100644
index 0000000..9ced69e
--- /dev/null
+++ b/configs/baseline/profiledef.sh
@@ -0,0 +1,12 @@
+#!/usr/bin/env bash
+# shellcheck disable=SC2034
+
+iso_name="archlinux-baseline"
+iso_label="ARCH_$(date +%Y%m)"
+iso_publisher="Arch Linux <https://www.archlinux.org>"
+iso_application="Arch Linux baseline"
+iso_version="$(date +%Y.%m.%d)"
+install_dir="arch"
+bootmodes=('bios.syslinux.mbr' 'bios.syslinux.eltorito')
+arch="x86_64"
+pacman_conf="pacman.conf"
diff --git a/configs/releng/profiledef.sh b/configs/releng/profiledef.sh
index 5eb5c5a..1aa93b6 100644
--- a/configs/releng/profiledef.sh
+++ b/configs/releng/profiledef.sh
@@ -7,6 +7,6 @@ iso_publisher="Arch Linux <https://www.archlinux.org>"
 iso_application="Arch Linux Live/Rescue CD"
 iso_version="$(date +%Y.%m.%d)"
 install_dir="arch"
-bootmodes=()
+bootmodes=('bios.syslinux.mbr' 'bios.syslinux.eltorito' 'uefi-x64.systemd-boot.esp' 'uefi-x64.systemd-boot.eltorito')
 arch="x86_64"
 pacman_conf="pacman.conf"
-- 
cgit v1.2.3-70-g09d2


From 31b1dfdbe40dc8c0dace436790708ced784fc402 Mon Sep 17 00:00:00 2001
From: nl6720 <nl6720@gmail.com>
Date: Wed, 12 Aug 2020 17:34:33 +0300
Subject: archiso/mkarchiso: delete all files in /boot not just the kernel and
 initramfs

There is nothing useful in /boot for the live system.
---
 archiso/mkarchiso | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

(limited to 'archiso/mkarchiso')

diff --git a/archiso/mkarchiso b/archiso/mkarchiso
index c2b6f24..482d934 100755
--- a/archiso/mkarchiso
+++ b/archiso/mkarchiso
@@ -187,13 +187,9 @@ _pacman () {
 _cleanup () {
     _msg_info "Cleaning up what we can on airootfs..."
 
-    # Delete initcpio image(s)
+    # Delete all files in /boot
     if [[ -d "${airootfs_dir}/boot" ]]; then
-        find "${airootfs_dir}/boot" -type f -name '*.img' -delete
-    fi
-    # Delete kernel(s)
-    if [[ -d "${airootfs_dir}/boot" ]]; then
-        find "${airootfs_dir}/boot" -type f -name 'vmlinuz*' -delete
+        find "${airootfs_dir}/boot" -mindepth 1 -delete
     fi
     # Delete pacman database sync cache files (*.tar.gz)
     if [[ -d "${airootfs_dir}/var/lib/pacman" ]]; then
-- 
cgit v1.2.3-70-g09d2


From e9f209efbf344213609d39b652e7bcbbfa14054d Mon Sep 17 00:00:00 2001
From: nl6720 <nl6720@gmail.com>
Date: Wed, 12 Aug 2020 18:24:30 +0300
Subject: Deprecate build.sh scripts and old mkarchiso commands

Replace build.sh scripts with calls to mkarchiso -B "profiledir" build_profile.

Fixes https://gitlab.archlinux.org/archlinux/archiso/-/issues/37 .
---
 README.rst                                         |  14 +-
 archiso/mkarchiso                                  |  23 +-
 configs/baseline/build.sh                          | 113 +-------
 configs/releng/airootfs/root/customize_airootfs.sh |   2 +-
 configs/releng/build.sh                            | 306 +--------------------
 5 files changed, 22 insertions(+), 436 deletions(-)

(limited to 'archiso/mkarchiso')

diff --git a/README.rst b/README.rst
index b65db6d..4c17082 100644
--- a/README.rst
+++ b/README.rst
@@ -32,8 +32,7 @@ Profiles
 Archiso comes with two profiles: **baseline** and **releng**. While both can serve as starting points for creating
 custom live media, **releng** is used to create the monthly installation medium.
 They can be found below `configs/baseline/ <configs/baseline/>`_  and `configs/releng/ <configs/releng/>`_
-(respectively). Both profiles are defined by files to be placed into overlays (e.g. *airootfs* -> *the image's /*) and
-dynamic actions (i.e. *build.sh* scripts).
+(respectively). Both profiles are defined by files to be placed into overlays (e.g. *airootfs* -> *the image's /*).
 
 Create images
 =============
@@ -50,28 +49,27 @@ be lost on update).
 
 The examples below will assume an unmodified profile in a system location (unless noted otherwise).
 
-It is advised to check the help information of the **build.sh** scripts in the profiles:
+It is advised to check the help information of the **mkarchiso**:
 
   .. code:: bash
 
-    /usr/share/archiso/configs/releng/build.sh --help
+    mkarchiso -h
 
 Create images with packaged archiso
 -----------------------------------
 
   .. code:: bash
 
-    /usr/share/archiso/configs/releng/build.sh -w path/to/work_dir -o path/to/out_dir
+    mkarchiso -B path/to/profile -w path/to/work_dir -o path/to/out_dir build_profile
 
 Create images with local clone
 ------------------------------
 
-Clone this repository and make sure to run with the local `mkarchiso <archiso/mkarchiso>`_  script in *PATH* (if it has
-been modified):
+Clone this repository and run:
 
   .. code:: bash
 
-    PATH="archiso:$PATH" ./configs/releng/build.sh -w path/to/work_dir -o path/to/out_dir
+    ./archiso/mkarchiso -B path/to/profile -w path/to/work_dir -o path/to/out_dir build_profile
 
 Testing
 =======
diff --git a/archiso/mkarchiso b/archiso/mkarchiso
index 482d934..7602e62 100755
--- a/archiso/mkarchiso
+++ b/archiso/mkarchiso
@@ -92,8 +92,8 @@ _usage () {
     IFS='' read -r -d '' usagetext <<ENDUSAGETEXT || true
 usage ${app_name} [options] command <command options>
  general options:
+    -B <profile_dir> Directory of the archiso profile to build
     -p PACKAGE(S)    Package(s) to install, can be used multiple times
-    -r <command>     Run <command> inside airootfs
     -C <file>        Config file for pacman.
                      Default: '${pacman_conf}'
     -L <label>       Set a label for the disk
@@ -118,18 +118,8 @@ usage ${app_name} [options] command <command options>
     -v               Enable verbose output
     -h               This message
  commands:
-   init
-      Make base layout and install base group
-   install
-      Install all specified packages (-p)
-   run
-      run command specified by -r
-   prepare
-      build all images
-   pkglist
-      make a pkglist.txt of packages installed on airootfs
-   iso <image name>
-      build an iso image from the working dir
+   build_profile
+      build an iso image from a profile
 ENDUSAGETEXT
     printf '%s\n' "${usagetext}"
     exit "${1}"
@@ -703,7 +693,6 @@ command_run() {
 }
 
 command_build_profile() {
-    _msg_warning "The ${FUNCNAME[0]#command_} command is not fully implemented yet :("
     # Set up essential directory paths
     airootfs_dir="${work_dir}/${arch}/airootfs"
     isofs_dir="${work_dir}/iso"
@@ -772,21 +761,27 @@ isofs_dir="${work_dir}/iso"
 
 case "${command_name}" in
     init)
+        _msg_warning "The '${command_name}' command is deprecated!"
         command_init
         ;;
     install)
+        _msg_warning "The '${command_name}' command is deprecated!"
         command_install
         ;;
     run)
+        _msg_warning "The '${command_name}' command is deprecated!"
         command_run
         ;;
     prepare)
+        _msg_warning "The '${command_name}' command is deprecated!"
         command_prepare
         ;;
     pkglist)
+        _msg_warning "The '${command_name}' command is deprecated!"
         command_pkglist
         ;;
     iso)
+        _msg_warning "The '${command_name}' command is deprecated!"
         if (( $# < 2 )); then
             _msg_error "No image specified" 0
             _usage 1
diff --git a/configs/baseline/build.sh b/configs/baseline/build.sh
index c0b1704..734ae26 100755
--- a/configs/baseline/build.sh
+++ b/configs/baseline/build.sh
@@ -2,113 +2,6 @@
 #
 # SPDX-License-Identifier: GPL-3.0-or-later
 
-set -e -u
-
-iso_name=archlinux
-iso_label="ARCH_$(date +%Y%m)"
-iso_version=$(date +%Y.%m.%d)
-install_dir=arch
-arch=$(uname -m)
-work_dir=work
-out_dir=out
-
-script_path="$( cd -P "$( dirname "$(readlink -f "$0")" )" && pwd )"
-
-umask 0022
-
-# Helper function to run make_*() only one time per architecture.
-run_once() {
-    if [[ ! -e "${work_dir}/build.${1}_${arch}" ]]; then
-        "$1"
-        touch "${work_dir}/build.${1}_${arch}"
-    fi
-}
-
-# Setup custom pacman.conf with current cache directories.
-make_pacman_conf() {
-    local _cache_dirs
-    _cache_dirs=("$(pacman -v 2>&1 | grep '^Cache Dirs:' | sed 's/Cache Dirs:\s*//g')")
-    sed -r "s|^#?\\s*CacheDir.+|CacheDir = $(echo -n "${_cache_dirs[@]}")|g" \
-        "${script_path}/pacman.conf" > "${work_dir}/pacman.conf"
-}
-
-# Prepare working directory and copy custom airootfs files (airootfs)
-make_custom_airootfs() {
-    local _airootfs="${work_dir}/airootfs"
-    mkdir -p -- "${_airootfs}"
-
-    if [[ -d  "${script_path}/airootfs" ]]; then
-        cp -af --no-preserve=ownership -- "${script_path}/airootfs/." "${_airootfs}"
-        [[ -e "${_airootfs}/etc/shadow" ]] && chmod -f 0400 -- "${_airootfs}/etc/shadow"
-        [[ -e "${_airootfs}/etc/gshadow" ]] && chmod -f 0400 -- "${_airootfs}/etc/gshadow"
-
-        # Set up user home directories and permissions
-        if [[ -e "${_airootfs}/etc/passwd" ]]; then
-            while IFS=':' read -a passwd -r; do
-                [[ "${passwd[5]}" == '/' ]] && continue
-
-                if [[ -d "${_airootfs}${passwd[5]}" ]]; then
-                    chown -hR -- "${passwd[2]}:${passwd[3]}" "${_airootfs}${passwd[5]}"
-                    chmod -f 0750 -- "${_airootfs}${passwd[5]}"
-                else
-                    install -d -m 0750 -o "${passwd[2]}" -g "${passwd[3]}" -- "${_airootfs}${passwd[5]}"
-                fi
-             done < "${_airootfs}/etc/passwd"
-        fi
-    fi
-}
-
-# Packages (airootfs)
-make_packages() {
-    mkarchiso -v -w "${work_dir}" -C "${work_dir}/pacman.conf" -D "${install_dir}" \
-        -p "$(grep -h -v '^#' "${script_path}/packages.x86_64"| sed ':a;N;$!ba;s/\n/ /g')" install
-}
-
-# Prepare ${install_dir}/boot/
-make_boot() {
-    mkdir -p "${work_dir}/iso/${install_dir}/boot/${arch}"
-    cp "${work_dir}/airootfs/boot/archiso.img" "${work_dir}/iso/${install_dir}/boot/${arch}/archiso.img"
-    cp "${work_dir}/airootfs/boot/vmlinuz-linux" "${work_dir}/iso/${install_dir}/boot/${arch}/"
-}
-
-# Prepare /${install_dir}/boot/syslinux
-make_syslinux() {
-    mkdir -p "${work_dir}/iso/${install_dir}/boot/syslinux"
-    sed "s|%ARCHISO_LABEL%|${iso_label}|g;
-         s|%INSTALL_DIR%|${install_dir}|g;
-         s|%ARCH%|${arch}|g" "${script_path}/syslinux/syslinux.cfg" > \
-             "${work_dir}/iso/${install_dir}/boot/syslinux/syslinux.cfg"
-    cp "${work_dir}/airootfs/usr/lib/syslinux/bios/ldlinux.c32" "${work_dir}/iso/${install_dir}/boot/syslinux/"
-    cp "${work_dir}/airootfs/usr/lib/syslinux/bios/menu.c32" "${work_dir}/iso/${install_dir}/boot/syslinux/"
-    cp "${work_dir}/airootfs/usr/lib/syslinux/bios/libutil.c32" "${work_dir}/iso/${install_dir}/boot/syslinux/"
-}
-
-# Prepare /isolinux
-make_isolinux() {
-    mkdir -p "${work_dir}/iso/isolinux"
-    sed "s|%INSTALL_DIR%|${install_dir}|g" "${script_path}/isolinux/isolinux.cfg" > \
-        "${work_dir}/iso/isolinux/isolinux.cfg"
-    cp "${work_dir}/airootfs/usr/lib/syslinux/bios/isolinux.bin" "${work_dir}/iso/isolinux/"
-    cp "${work_dir}/airootfs/usr/lib/syslinux/bios/isohdpfx.bin" "${work_dir}/iso/isolinux/"
-    cp "${work_dir}/airootfs/usr/lib/syslinux/bios/ldlinux.c32" "${work_dir}/iso/isolinux/"
-}
-
-# Build airootfs filesystem image
-make_prepare() {
-    mkarchiso -v -w "${work_dir}" -D "${install_dir}" prepare
-}
-
-# Build ISO
-make_iso() {
-    mkarchiso -v -w "${work_dir}" -D "${install_dir}" -L "${iso_label}" -o "${out_dir}" iso \
-        "${iso_name}-${iso_version}-${arch}.iso"
-}
-
-run_once make_custom_airootfs
-run_once make_pacman_conf
-run_once make_packages
-run_once make_boot
-run_once make_syslinux
-run_once make_isolinux
-run_once make_prepare
-run_once make_iso
+printf '\n[%s] WARNING: %s\n\n' "mkarchiso" "build.sh scripts are deprecated! Please use mkarchiso directly." >&2
+_buildsh_path="$(realpath -- "$0")"
+exec mkarchiso "$@" -B "${_buildsh_path%/*}" build_profile
diff --git a/configs/releng/airootfs/root/customize_airootfs.sh b/configs/releng/airootfs/root/customize_airootfs.sh
index cf3fe19..dbcde48 100755
--- a/configs/releng/airootfs/root/customize_airootfs.sh
+++ b/configs/releng/airootfs/root/customize_airootfs.sh
@@ -4,7 +4,7 @@
 
 set -e -u
 
-echo 'Warning: customize_airootfs.sh is deprecated! Support for it will be removed in a future archiso version.'
+# Warning: customize_airootfs.sh is deprecated! Support for it will be removed in a future archiso version.
 
 sed -i 's/#\(en_US\.UTF-8\)/\1/' /etc/locale.gen
 locale-gen
diff --git a/configs/releng/build.sh b/configs/releng/build.sh
index 709bd46..734ae26 100755
--- a/configs/releng/build.sh
+++ b/configs/releng/build.sh
@@ -2,306 +2,6 @@
 #
 # SPDX-License-Identifier: GPL-3.0-or-later
 
-set -e -u
-
-iso_name=archlinux
-iso_label="ARCH_$(date +%Y%m)"
-iso_publisher="Arch Linux <http://www.archlinux.org>"
-iso_application="Arch Linux Live/Rescue CD"
-iso_version=$(date +%Y.%m.%d)
-install_dir=arch
-work_dir=work
-out_dir=out
-gpg_key=""
-
-verbose=""
-script_path="$( cd -P "$( dirname "$(readlink -f "$0")" )" && pwd )"
-
-umask 0022
-
-_usage ()
-{
-    echo "usage ${0} [options]"
-    echo
-    echo " General options:"
-    echo "    -N <iso_name>      Set an iso filename (prefix)"
-    echo "                        Default: ${iso_name}"
-    echo "    -V <iso_version>   Set an iso version (in filename)"
-    echo "                        Default: ${iso_version}"
-    echo "    -L <iso_label>     Set an iso label (disk label)"
-    echo "                        Default: ${iso_label}"
-    echo "    -P <publisher>     Set a publisher for the disk"
-    echo "                        Default: '${iso_publisher}'"
-    echo "    -A <application>   Set an application name for the disk"
-    echo "                        Default: '${iso_application}'"
-    echo "    -D <install_dir>   Set an install_dir (directory inside iso)"
-    echo "                        Default: ${install_dir}"
-    echo "    -w <work_dir>      Set the working directory"
-    echo "                        Default: ${work_dir}"
-    echo "    -o <out_dir>       Set the output directory"
-    echo "                        Default: ${out_dir}"
-    echo "    -v                 Enable verbose output"
-    echo "    -h                 This help message"
-    exit "${1}"
-}
-
-# Helper function to run make_*() only one time per architecture.
-run_once() {
-    if [[ ! -e "${work_dir}/build.${1}" ]]; then
-        "$1"
-        touch "${work_dir}/build.${1}"
-    fi
-}
-
-# Setup custom pacman.conf with current cache directories.
-make_pacman_conf() {
-    local _cache_dirs
-    _cache_dirs=("$(pacman -v 2>&1 | grep '^Cache Dirs:' | sed 's/Cache Dirs:\s*//g')")
-    sed -r "s|^#?\\s*CacheDir.+|CacheDir = $(echo -n "${_cache_dirs[@]}")|g" \
-        "${script_path}/pacman.conf" > "${work_dir}/pacman.conf"
-}
-
-# Prepare working directory and copy custom airootfs files (airootfs)
-make_custom_airootfs() {
-    local _airootfs="${work_dir}/x86_64/airootfs"
-    mkdir -p -- "${_airootfs}"
-
-    if [[ -d "${script_path}/airootfs" ]]; then
-        cp -af --no-preserve=ownership -- "${script_path}/airootfs/." "${_airootfs}"
-
-        [[ -e "${_airootfs}/etc/shadow" ]] && chmod -f 0400 -- "${_airootfs}/etc/shadow"
-        [[ -e "${_airootfs}/etc/gshadow" ]] && chmod -f 0400 -- "${_airootfs}/etc/gshadow"
-
-        # Set up user home directories and permissions
-        if [[ -e "${_airootfs}/etc/passwd" ]]; then
-            while IFS=':' read -a passwd -r; do
-                [[ "${passwd[5]}" == '/' ]] && continue
-
-                if [[ -d "${_airootfs}${passwd[5]}" ]]; then
-                    chown -hR -- "${passwd[2]}:${passwd[3]}" "${_airootfs}${passwd[5]}"
-                    chmod -f 0750 -- "${_airootfs}${passwd[5]}"
-                else
-                    install -d -m 0750 -o "${passwd[2]}" -g "${passwd[3]}" -- "${_airootfs}${passwd[5]}"
-                fi
-             done < "${_airootfs}/etc/passwd"
-        fi
-    fi
-}
-
-# Packages (airootfs)
-make_packages() {
-    if [[ "${gpg_key}" ]]; then
-      gpg --export "${gpg_key}" > "${work_dir}/gpgkey"
-      exec 17<>"${work_dir}/gpgkey"
-    fi
-    if [ -n "${verbose}" ]; then
-        ARCHISO_GNUPG_FD="${gpg_key:+17}" mkarchiso -v -w "${work_dir}/x86_64" -C "${work_dir}/pacman.conf" -D "${install_dir}" \
-            -p "$(grep -h -v '^#' "${script_path}/packages.x86_64"| sed ':a;N;$!ba;s/\n/ /g')" install
-    else
-        ARCHISO_GNUPG_FD="${gpg_key:+17}" mkarchiso -w "${work_dir}/x86_64" -C "${work_dir}/pacman.conf" -D "${install_dir}" \
-            -p "$(grep -h -v '^#' "${script_path}/packages.x86_64"| sed ':a;N;$!ba;s/\n/ /g')" install
-    fi
-    if [[ "${gpg_key}" ]]; then
-      exec 17<&-
-    fi
-}
-
-# Customize installation (airootfs)
-make_customize_airootfs() {
-    if [[ -e "${script_path}/airootfs/etc/passwd" ]]; then
-        while IFS=':' read -a passwd -r; do
-            [[ "${passwd[5]}" == '/' ]] && continue
-            cp -RdT --preserve=mode,timestamps,links -- "${work_dir}/x86_64/airootfs/etc/skel" "${work_dir}/x86_64/airootfs${passwd[5]}"
-            chown -hR -- "${passwd[2]}:${passwd[3]}" "${work_dir}/x86_64/airootfs${passwd[5]}"
-
-        done < "${script_path}/airootfs/etc/passwd"
-    fi
-
-    if [[ -e "${work_dir}/x86_64/airootfs/root/customize_airootfs.sh" ]]; then
-        if [ -n "${verbose}" ]; then
-            mkarchiso -v -w "${work_dir}/x86_64" -C "${work_dir}/pacman.conf" -D "${install_dir}" \
-                -r '/root/customize_airootfs.sh' run
-        else
-            mkarchiso -w "${work_dir}/x86_64" -C "${work_dir}/pacman.conf" -D "${install_dir}" \
-                -r '/root/customize_airootfs.sh' run
-        fi
-        rm "${work_dir}/x86_64/airootfs/root/customize_airootfs.sh"
-    fi
-}
-
-# Prepare kernel/initramfs ${install_dir}/boot/
-make_boot() {
-    mkdir -p "${work_dir}/iso/${install_dir}/boot/x86_64"
-    cp "${work_dir}/x86_64/airootfs/boot/archiso.img" "${work_dir}/iso/${install_dir}/boot/x86_64/"
-    cp "${work_dir}/x86_64/airootfs/boot/vmlinuz-linux" "${work_dir}/iso/${install_dir}/boot/x86_64/"
-}
-
-# Add other aditional/extra files to ${install_dir}/boot/
-make_boot_extra() {
-    if [[ -e "${work_dir}/x86_64/airootfs/boot/memtest86+/memtest.bin" ]]; then
-        # rename for PXE: https://wiki.archlinux.org/index.php/Syslinux#Using_memtest
-        cp "${work_dir}/x86_64/airootfs/boot/memtest86+/memtest.bin" "${work_dir}/iso/${install_dir}/boot/memtest"
-        mkdir -p "${work_dir}/iso/${install_dir}/boot/licenses/memtest86+/"
-        cp "${work_dir}/x86_64/airootfs/usr/share/licenses/common/GPL2/license.txt" \
-            "${work_dir}/iso/${install_dir}/boot/licenses/memtest86+/"
-    fi
-    if [[ -e "${work_dir}/x86_64/airootfs/boot/intel-ucode.img" ]]; then
-        cp "${work_dir}/x86_64/airootfs/boot/intel-ucode.img" "${work_dir}/iso/${install_dir}/boot/"
-        mkdir -p "${work_dir}/iso/${install_dir}/boot/licenses/intel-ucode/"
-        cp "${work_dir}/x86_64/airootfs/usr/share/licenses/intel-ucode/"* \
-            "${work_dir}/iso/${install_dir}/boot/licenses/intel-ucode/"
-    fi
-    if [[ -e "${work_dir}/x86_64/airootfs/boot/amd-ucode.img" ]]; then
-        cp "${work_dir}/x86_64/airootfs/boot/amd-ucode.img" "${work_dir}/iso/${install_dir}/boot/"
-        mkdir -p "${work_dir}/iso/${install_dir}/boot/licenses/amd-ucode/"
-        cp "${work_dir}/x86_64/airootfs/usr/share/licenses/amd-ucode/"* \
-            "${work_dir}/iso/${install_dir}/boot/licenses/amd-ucode/"
-    fi
-}
-
-# Prepare /${install_dir}/boot/syslinux
-make_syslinux() {
-    _uname_r=$(file -b "${work_dir}/x86_64/airootfs/boot/vmlinuz-linux"| awk 'f{print;f=0} /version/{f=1}' RS=' ')
-    mkdir -p "${work_dir}/iso/${install_dir}/boot/syslinux"
-    for _cfg in "${script_path}/syslinux/"*.cfg; do
-        sed "s|%ARCHISO_LABEL%|${iso_label}|g;
-             s|%INSTALL_DIR%|${install_dir}|g" "${_cfg}" > "${work_dir}/iso/${install_dir}/boot/syslinux/${_cfg##*/}"
-    done
-    cp "${script_path}/syslinux/splash.png" "${work_dir}/iso/${install_dir}/boot/syslinux/"
-    cp "${work_dir}/x86_64/airootfs/usr/lib/syslinux/bios/"*.c32 "${work_dir}/iso/${install_dir}/boot/syslinux/"
-    cp "${work_dir}/x86_64/airootfs/usr/lib/syslinux/bios/lpxelinux.0" "${work_dir}/iso/${install_dir}/boot/syslinux/"
-    cp "${work_dir}/x86_64/airootfs/usr/lib/syslinux/bios/memdisk" "${work_dir}/iso/${install_dir}/boot/syslinux/"
-    mkdir -p "${work_dir}/iso/${install_dir}/boot/syslinux/hdt"
-    gzip -c -9 "${work_dir}/x86_64/airootfs/usr/share/hwdata/pci.ids" > \
-        "${work_dir}/iso/${install_dir}/boot/syslinux/hdt/pciids.gz"
-    gzip -c -9 "${work_dir}/x86_64/airootfs/usr/lib/modules/${_uname_r}/modules.alias" > \
-        "${work_dir}/iso/${install_dir}/boot/syslinux/hdt/modalias.gz"
-}
-
-# Prepare /isolinux
-make_isolinux() {
-    mkdir -p "${work_dir}/iso/isolinux"
-    sed "s|%INSTALL_DIR%|${install_dir}|g" \
-        "${script_path}/isolinux/isolinux.cfg" > "${work_dir}/iso/isolinux/isolinux.cfg"
-    cp "${work_dir}/x86_64/airootfs/usr/lib/syslinux/bios/isolinux.bin" "${work_dir}/iso/isolinux/"
-    cp "${work_dir}/x86_64/airootfs/usr/lib/syslinux/bios/isohdpfx.bin" "${work_dir}/iso/isolinux/"
-    cp "${work_dir}/x86_64/airootfs/usr/lib/syslinux/bios/ldlinux.c32" "${work_dir}/iso/isolinux/"
-}
-
-# Prepare /EFI
-make_efi() {
-    mkdir -p "${work_dir}/iso/EFI/boot"
-    cp "${work_dir}/x86_64/airootfs/usr/lib/systemd/boot/efi/systemd-bootx64.efi" \
-        "${work_dir}/iso/EFI/boot/bootx64.efi"
-
-    mkdir -p "${work_dir}/iso/loader/entries"
-    cp "${script_path}/efiboot/loader/loader.conf" "${work_dir}/iso/loader/"
-
-    sed "s|%ARCHISO_LABEL%|${iso_label}|g;
-         s|%INSTALL_DIR%|${install_dir}|g" \
-        "${script_path}/efiboot/loader/entries/archiso-x86_64-usb.conf" > \
-        "${work_dir}/iso/loader/entries/archiso-x86_64.conf"
-
-    # edk2-shell based UEFI shell
-    # shellx64.efi is picked up automatically when on /
-    cp "${work_dir}/x86_64/airootfs/usr/share/edk2-shell/x64/Shell_Full.efi" "${work_dir}/iso/shellx64.efi"
-}
-
-# Prepare efiboot.img::/EFI for "El Torito" EFI boot mode
-make_efiboot() {
-    mkdir -p "${work_dir}/iso/EFI/archiso"
-    truncate -s 64M "${work_dir}/iso/EFI/archiso/efiboot.img"
-    mkfs.fat -n ARCHISO_EFI "${work_dir}/iso/EFI/archiso/efiboot.img"
-
-    mkdir -p "${work_dir}/efiboot"
-    mount "${work_dir}/iso/EFI/archiso/efiboot.img" "${work_dir}/efiboot"
-
-    mkdir -p "${work_dir}/efiboot/EFI/archiso"
-    cp "${work_dir}/iso/${install_dir}/boot/x86_64/vmlinuz-linux" "${work_dir}/efiboot/EFI/archiso/"
-    cp "${work_dir}/iso/${install_dir}/boot/x86_64/archiso.img" "${work_dir}/efiboot/EFI/archiso/"
-
-    cp "${work_dir}/iso/${install_dir}/boot/intel-ucode.img" "${work_dir}/efiboot/EFI/archiso/"
-    cp "${work_dir}/iso/${install_dir}/boot/amd-ucode.img" "${work_dir}/efiboot/EFI/archiso/"
-
-    mkdir -p "${work_dir}/efiboot/EFI/boot"
-    cp "${work_dir}/x86_64/airootfs/usr/lib/systemd/boot/efi/systemd-bootx64.efi" \
-        "${work_dir}/efiboot/EFI/boot/bootx64.efi"
-
-    mkdir -p "${work_dir}/efiboot/loader/entries"
-    cp "${script_path}/efiboot/loader/loader.conf" "${work_dir}/efiboot/loader/"
-
-    sed "s|%ARCHISO_LABEL%|${iso_label}|g;
-         s|%INSTALL_DIR%|${install_dir}|g" \
-        "${script_path}/efiboot/loader/entries/archiso-x86_64-cd.conf" > \
-        "${work_dir}/efiboot/loader/entries/archiso-x86_64.conf"
-
-    # shellx64.efi is picked up automatically when on /
-    cp "${work_dir}/iso/shellx64.efi" "${work_dir}/efiboot/"
-
-    umount -d "${work_dir}/efiboot"
-}
-
-# Build airootfs filesystem image
-make_prepare() {
-    cp -a -l -f "${work_dir}/x86_64/airootfs" "${work_dir}"
-    if [ -n "${verbose}" ]; then
-        mkarchiso -v -w "${work_dir}" -D "${install_dir}" pkglist
-        mkarchiso -v -w "${work_dir}" -D "${install_dir}" ${gpg_key:+-g ${gpg_key}} prepare
-    else
-        mkarchiso -w "${work_dir}" -D "${install_dir}" pkglist
-        mkarchiso -w "${work_dir}" -D "${install_dir}" ${gpg_key:+-g ${gpg_key}} prepare
-    fi
-    rm -rf "${work_dir}/airootfs"
-    # rm -rf "${work_dir}/x86_64/airootfs" (if low space, this helps)
-}
-
-# Build ISO
-make_iso() {
-    if [ -n "${verbose}" ]; then
-        mkarchiso -v -w "${work_dir}" -D "${install_dir}" -L "${iso_label}" -P "${iso_publisher}" \
-            -A "${iso_application}" -o "${out_dir}" iso "${iso_name}-${iso_version}-x86_64.iso"
-    else
-        mkarchiso -w "${work_dir}" -D "${install_dir}" -L "${iso_label}" -P "${iso_publisher}" \
-            -A "${iso_application}" -o "${out_dir}" iso "${iso_name}-${iso_version}-x86_64.iso"
-    fi
-}
-
-if [[ ${EUID} -ne 0 ]]; then
-    echo "This script must be run as root."
-    _usage 1
-fi
-
-while getopts 'N:V:L:P:A:D:w:o:g:vh' arg; do
-    case "${arg}" in
-        N) iso_name="${OPTARG}" ;;
-        V) iso_version="${OPTARG}" ;;
-        L) iso_label="${OPTARG}" ;;
-        P) iso_publisher="${OPTARG}" ;;
-        A) iso_application="${OPTARG}" ;;
-        D) install_dir="${OPTARG}" ;;
-        w) work_dir="${OPTARG}" ;;
-        o) out_dir="${OPTARG}" ;;
-        g) gpg_key="${OPTARG}" ;;
-        v) verbose="-v" ;;
-        h) _usage 0 ;;
-        *)
-           echo "Invalid argument '${arg}'"
-           _usage 1
-           ;;
-    esac
-done
-
-mkdir -p "${work_dir}"
-
-run_once make_pacman_conf
-run_once make_custom_airootfs
-run_once make_packages
-run_once make_customize_airootfs
-run_once make_boot
-run_once make_boot_extra
-run_once make_syslinux
-run_once make_isolinux
-run_once make_efi
-run_once make_efiboot
-run_once make_prepare
-run_once make_iso
+printf '\n[%s] WARNING: %s\n\n' "mkarchiso" "build.sh scripts are deprecated! Please use mkarchiso directly." >&2
+_buildsh_path="$(realpath -- "$0")"
+exec mkarchiso "$@" -B "${_buildsh_path%/*}" build_profile
-- 
cgit v1.2.3-70-g09d2


From e6455b885b2ae46e285cd81080d980cf876d6ea7 Mon Sep 17 00:00:00 2001
From: nl6720 <nl6720@gmail.com>
Date: Wed, 12 Aug 2020 15:05:56 +0300
Subject: archiso/mkarchiso: create an empty /etc/machine-id

Fixes https://gitlab.archlinux.org/archlinux/archiso/-/issues/42 .
---
 archiso/mkarchiso                      | 2 ++
 configs/releng/airootfs/etc/machine-id | 0
 2 files changed, 2 insertions(+)
 delete mode 100644 configs/releng/airootfs/etc/machine-id

(limited to 'archiso/mkarchiso')

diff --git a/archiso/mkarchiso b/archiso/mkarchiso
index 7602e62..e5bd9cb 100755
--- a/archiso/mkarchiso
+++ b/archiso/mkarchiso
@@ -204,6 +204,8 @@ _cleanup () {
     # Delete package pacman related files.
     find "${work_dir}" \( -name '*.pacnew' -o -name '*.pacsave' -o -name '*.pacorig' \) -delete
     _msg_info "Done!"
+    # Create an empty /etc/machine-id
+    printf '' > "${work_dir}/airootfs/etc/machine-id"
 }
 
 # Makes a ext4 filesystem inside a SquashFS from a source directory.
diff --git a/configs/releng/airootfs/etc/machine-id b/configs/releng/airootfs/etc/machine-id
deleted file mode 100644
index e69de29..0000000
-- 
cgit v1.2.3-70-g09d2


From 41d3d7d4897ca35812ec07327efcbe4248bd6bbd Mon Sep 17 00:00:00 2001
From: nl6720 <nl6720@gmail.com>
Date: Wed, 12 Aug 2020 14:20:22 +0300
Subject: Add Joliet file system to the ISO

Joliet ensures correct file names capitalization on operating systems that support Joliet but not support Rock Ridge.
Implements https://gitlab.archlinux.org/archlinux/archiso/-/issues/45 .
---
 archiso/mkarchiso | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'archiso/mkarchiso')

diff --git a/archiso/mkarchiso b/archiso/mkarchiso
index e5bd9cb..7fd4c41 100755
--- a/archiso/mkarchiso
+++ b/archiso/mkarchiso
@@ -560,6 +560,8 @@ _make_iso() {
     xorriso -as mkisofs \
             -iso-level 3 \
             -full-iso9660-filenames \
+            -joliet \
+            -joliet-long \
             -rational-rock \
             -volid "${iso_label}" \
             -appid "${iso_application}" \
-- 
cgit v1.2.3-70-g09d2


From 13b8c7d09901539cf9239d5accec1035bd9ef5bc Mon Sep 17 00:00:00 2001
From: nl6720 <nl6720@gmail.com>
Date: Tue, 18 Aug 2020 21:59:18 +0300
Subject: archiso/mkarchiso: correct the path of airootfs/etc/machine-id

Use "${airootfs_dir}".
Fixes a mistake introduced when rebasing https://gitlab.archlinux.org/archlinux/archiso/-/merge_requests/64 .
---
 archiso/mkarchiso | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'archiso/mkarchiso')

diff --git a/archiso/mkarchiso b/archiso/mkarchiso
index 7fd4c41..4a010ad 100755
--- a/archiso/mkarchiso
+++ b/archiso/mkarchiso
@@ -205,7 +205,7 @@ _cleanup () {
     find "${work_dir}" \( -name '*.pacnew' -o -name '*.pacsave' -o -name '*.pacorig' \) -delete
     _msg_info "Done!"
     # Create an empty /etc/machine-id
-    printf '' > "${work_dir}/airootfs/etc/machine-id"
+    printf '' > "${airootfs_dir}/etc/machine-id"
 }
 
 # Makes a ext4 filesystem inside a SquashFS from a source directory.
-- 
cgit v1.2.3-70-g09d2


From e2c5b4527ff1848a0ebaaca0ab9d05077ae08eee Mon Sep 17 00:00:00 2001
From: nl6720 <nl6720@gmail.com>
Date: Thu, 20 Aug 2020 17:00:06 +0300
Subject: archiso/mkarchiso: reduce duplication and add more info messages

Fixes to issues introduced in https://gitlab.archlinux.org/archlinux/archiso/-/merge_requests/59 :
- _make_boot_on_fat(): copy initramfs from "${airootfs_dir}/boot/" not "${isofs_dir}/". Otherwise UEFI-only ISOs cannot be built.

Some general fixes:
- Replace mkdir with install. Unlike mkdir, install does not complain when the target exists.
- Reduce excess newlines produced by messages.
- Ensure FAT image gets unmounted in case the script is interrupted.
- Create the ext4 image with mkfs.ext4 instead of truncate.
- Do not rely on user and group names for chown commands. Use numeric UID and GID instead.
- Minimize the times stderr is redirected to /dev/null.
- Add missing '?' to getopts.
- Standardize function definitions by removing spaces between the function name and () .
---
 archiso/mkarchiso | 272 ++++++++++++++++++++++++++++++------------------------
 1 file changed, 149 insertions(+), 123 deletions(-)

(limited to 'archiso/mkarchiso')

diff --git a/archiso/mkarchiso b/archiso/mkarchiso
index 4a010ad..2ccf7f0 100755
--- a/archiso/mkarchiso
+++ b/archiso/mkarchiso
@@ -39,14 +39,13 @@ bootmodes=()
 _msg_info() {
     local _msg="${1}"
     [[ "${quiet}" == "y" ]] || printf '[%s] INFO: %s\n' "${app_name}" "${_msg}"
-
 }
 
 # Show a WARNING message
 # $1: message string
 _msg_warning() {
     local _msg="${1}"
-    printf '\n[%s] WARNING: %s\n\n' "${app_name}" "${_msg}" >&2
+    printf '[%s] WARNING: %s\n' "${app_name}" "${_msg}" >&2
 }
 
 # Show an ERROR message then exit with status
@@ -55,14 +54,14 @@ _msg_warning() {
 _msg_error() {
     local _msg="${1}"
     local _error=${2}
-    printf '\n[%s] ERROR: %s\n\n' "${app_name}" "${_msg}" >&2
+    printf '[%s] ERROR: %s\n' "${app_name}" "${_msg}" >&2
     if (( _error > 0 )); then
         exit "${_error}"
     fi
 }
 
 _chroot_init() {
-    mkdir -p -- "${airootfs_dir}"
+    install -d -m 0755 -o 0 -g 0 -- "${airootfs_dir}"
     _pacman base syslinux
 }
 
@@ -72,35 +71,51 @@ _chroot_run() {
 
 _mount_airootfs() {
     trap "_umount_airootfs" EXIT HUP INT TERM
-    mkdir -p -- "${work_dir}/mnt/airootfs"
-    _msg_info "Mounting '${airootfs_dir}.img' on '${work_dir}/mnt/airootfs'"
+    install -d -m 0755 -- "${work_dir}/mnt/airootfs"
+    _msg_info "Mounting '${airootfs_dir}.img' on '${work_dir}/mnt/airootfs'..."
     mount -- "${airootfs_dir}.img" "${work_dir}/mnt/airootfs"
     _msg_info "Done!"
 }
 
 _umount_airootfs() {
-    _msg_info "Unmounting '${work_dir}/mnt/airootfs'"
+    _msg_info "Unmounting '${work_dir}/mnt/airootfs'..."
     umount -d -- "${work_dir}/mnt/airootfs"
     _msg_info "Done!"
     rmdir -- "${work_dir}/mnt/airootfs"
     trap - EXIT HUP INT TERM
 }
 
+_mount_efibootimg() {
+    trap "_umount_efibootimg" EXIT HUP INT TERM
+    install -d -m 0755 -- "${work_dir}/mnt/efiboot"
+    _msg_info "Mounting '${isofs_dir}/EFI/archiso/efiboot.img' on '${work_dir}/mnt/efiboot'..."
+    mount -- "${isofs_dir}/EFI/archiso/efiboot.img" "${work_dir}/mnt/efiboot"
+    _msg_info "Done!"
+}
+
+_umount_efibootimg() {
+    _msg_info "Unmounting '${work_dir}/mnt/efiboot'..."
+    umount -d -- "${work_dir}/mnt/efiboot"
+    _msg_info "Done!"
+    rmdir -- "${work_dir}/mnt/efiboot"
+    trap - EXIT HUP INT TERM
+}
+
 # Show help usage, with an exit status.
 # $1: exit status number.
-_usage () {
+_usage() {
     IFS='' read -r -d '' usagetext <<ENDUSAGETEXT || true
 usage ${app_name} [options] command <command options>
  general options:
     -B <profile_dir> Directory of the archiso profile to build
     -p PACKAGE(S)    Package(s) to install, can be used multiple times
-    -C <file>        Config file for pacman.
+    -C <file>        pacman configuration file.
                      Default: '${pacman_conf}'
-    -L <label>       Set a label for the disk
+    -L <label>       Set the ISO volume label
                      Default: '${iso_label}'
-    -P <publisher>   Set a publisher for the disk
+    -P <publisher>   Set a ISO publisher
                      Default: '${iso_publisher}'
-    -A <application> Set an application name for the disk
+    -A <application> Set an application name for the ISO
                      Default: '${iso_application}'
     -D <install_dir> Set an install_dir. All files will by located here.
                      Default: '${install_dir}'
@@ -121,47 +136,61 @@ usage ${app_name} [options] command <command options>
    build_profile
       build an iso image from a profile
 ENDUSAGETEXT
-    printf '%s\n' "${usagetext}"
+    printf '%s' "${usagetext}"
     exit "${1}"
 }
 
 # Shows configuration according to command mode.
-# $1: init | install | run | prepare | iso
-_show_config () {
+# $1: build_profile | init | install | run | prepare | iso
+_show_config() {
     local _mode="$1"
-    printf '\n'
-    _msg_info "Configuration settings"
+    _msg_info "${app_name} configuration settings"
     _msg_info "                  Command:   ${command_name}"
     _msg_info "             Architecture:   ${arch}"
     _msg_info "        Working directory:   ${work_dir}"
     _msg_info "   Installation directory:   ${install_dir}"
     case "${_mode}" in
+        build_profile)
+            _msg_info "         Output directory:   ${out_dir}"
+            _msg_info "                  GPG key:   ${gpg_key:-None}"
+            _msg_info "                  Profile:   ${profile}"
+            _msg_info "Pacman configuration file:   ${pacman_conf}"
+            _msg_info "          Image file name:   ${img_name}"
+            _msg_info "         ISO volume label:   ${iso_label}"
+            _msg_info "            ISO publisher:   ${iso_publisher}"
+            _msg_info "          ISO application:   ${iso_application}"
+            _msg_info "               Boot modes:   ${bootmodes[*]}"
+            _msg_info "                 Packages:   ${pkg_list[*]}"
+            ;;
         init)
-            _msg_info "       Pacman config file:   ${pacman_conf}"
+            _msg_info "Pacman configuration file:   ${pacman_conf}"
             ;;
         install)
-            _msg_info "       Pacman config file:   ${pacman_conf}"
+            _msg_info "                  GPG key:   ${gpg_key:-None}"
+            _msg_info "Pacman configuration file:   ${pacman_conf}"
             _msg_info "                 Packages:   ${pkg_list[*]}"
             ;;
         run)
             _msg_info "              Run command:   ${run_cmd}"
             ;;
         prepare)
+            _msg_info "                  GPG key:   ${gpg_key:-None}"
             ;;
         pkglist)
             ;;
         iso)
-            _msg_info "               Image name:   ${img_name}"
-            _msg_info "               Disk label:   ${iso_label}"
-            _msg_info "           Disk publisher:   ${iso_publisher}"
-            _msg_info "         Disk application:   ${iso_application}"
+            _msg_info "         Output directory:   ${out_dir}"
+            _msg_info "          Image file name:   ${img_name}"
+            _msg_info "         ISO volume label:   ${iso_label}"
+            _msg_info "            ISO publisher:   ${iso_publisher}"
+            _msg_info "          ISO application:   ${iso_application}"
             ;;
     esac
-    printf '\n'
+    [[ "${quiet}" == "y" ]] || printf '\n'
 }
 
 # Install desired packages to airootfs
-_pacman () {
+_pacman() {
     _msg_info "Installing packages to '${airootfs_dir}/'..."
 
     if [[ "${quiet}" = "y" ]]; then
@@ -170,11 +199,11 @@ _pacman () {
         pacstrap -C "${pacman_conf}" -c -G -M -- "${airootfs_dir}" "$@"
     fi
 
-    _msg_info "Packages installed successfully!"
+    _msg_info "Done! Packages installed successfully."
 }
 
 # Cleanup airootfs
-_cleanup () {
+_cleanup() {
     _msg_info "Cleaning up what we can on airootfs..."
 
     # Delete all files in /boot
@@ -203,37 +232,37 @@ _cleanup () {
     fi
     # Delete package pacman related files.
     find "${work_dir}" \( -name '*.pacnew' -o -name '*.pacsave' -o -name '*.pacorig' \) -delete
-    _msg_info "Done!"
     # Create an empty /etc/machine-id
     printf '' > "${airootfs_dir}/etc/machine-id"
+
+    _msg_info "Done!"
 }
 
 # Makes a ext4 filesystem inside a SquashFS from a source directory.
-_mkairootfs_img () {
+_mkairootfs_img() {
     if [[ ! -e "${airootfs_dir}" ]]; then
         _msg_error "The path '${airootfs_dir}' does not exist" 1
     fi
 
-    _msg_info "Creating ext4 image of 32GiB..."
-    truncate -s 32G -- "${airootfs_dir}.img"
+    _msg_info "Creating ext4 image of 32 GiB..."
     if [[ "${quiet}" == "y" ]]; then
-        mkfs.ext4 -q -O '^has_journal,^resize_inode' -E 'lazy_itable_init=0' -m 0 -F -- "${airootfs_dir}.img"
+        mkfs.ext4 -q -O '^has_journal,^resize_inode' -E 'lazy_itable_init=0' -m 0 -F -- "${airootfs_dir}.img" 32G
     else
-        mkfs.ext4 -O '^has_journal,^resize_inode' -E 'lazy_itable_init=0' -m 0 -F -- "${airootfs_dir}.img"
+        mkfs.ext4 -O '^has_journal,^resize_inode' -E 'lazy_itable_init=0' -m 0 -F -- "${airootfs_dir}.img" 32G
     fi
-    tune2fs -c 0 -i 0 -- "${airootfs_dir}.img" &> /dev/null
+    tune2fs -c 0 -i 0 -- "${airootfs_dir}.img" > /dev/null
     _msg_info "Done!"
     _mount_airootfs
     _msg_info "Copying '${airootfs_dir}/' to '${work_dir}/mnt/airootfs/'..."
     cp -aT -- "${airootfs_dir}/" "${work_dir}/mnt/airootfs/"
-    chown root:root -- "${work_dir}/mnt/airootfs/"
+    chown -- 0:0 "${work_dir}/mnt/airootfs/"
     _msg_info "Done!"
     _umount_airootfs
-    mkdir -p -- "${isofs_dir}/${install_dir}/${arch}"
+    install -d -m 0755 -- "${isofs_dir}/${install_dir}/${arch}"
     _msg_info "Creating SquashFS image, this may take some time..."
     if [[ "${quiet}" = "y" ]]; then
         mksquashfs "${airootfs_dir}.img" "${isofs_dir}/${install_dir}/${arch}/airootfs.sfs" -noappend \
-            -comp "${sfs_comp}" -no-progress &> /dev/null
+            -comp "${sfs_comp}" -no-progress > /dev/null
     else
         mksquashfs "${airootfs_dir}.img" "${isofs_dir}/${install_dir}/${arch}/airootfs.sfs" -noappend \
             -comp "${sfs_comp}"
@@ -243,16 +272,16 @@ _mkairootfs_img () {
 }
 
 # Makes a SquashFS filesystem from a source directory.
-_mkairootfs_sfs () {
+_mkairootfs_sfs() {
     if [[ ! -e "${airootfs_dir}" ]]; then
         _msg_error "The path '${airootfs_dir}' does not exist" 1
     fi
 
-    mkdir -p -- "${isofs_dir}/${install_dir}/${arch}"
+    install -d -m 0755 -- "${isofs_dir}/${install_dir}/${arch}"
     _msg_info "Creating SquashFS image, this may take some time..."
     if [[ "${quiet}" = "y" ]]; then
         mksquashfs "${airootfs_dir}" "${isofs_dir}/${install_dir}/${arch}/airootfs.sfs" -noappend \
-            -comp "${sfs_comp}" -no-progress &> /dev/null
+            -comp "${sfs_comp}" -no-progress > /dev/null
     else
         mksquashfs "${airootfs_dir}" "${isofs_dir}/${install_dir}/${arch}/airootfs.sfs" -noappend \
             -comp "${sfs_comp}"
@@ -260,7 +289,7 @@ _mkairootfs_sfs () {
     _msg_info "Done!"
 }
 
-_mkchecksum () {
+_mkchecksum() {
     _msg_info "Creating checksum file for self-test..."
     cd -- "${isofs_dir}/${install_dir}/${arch}"
     sha512sum airootfs.sfs > airootfs.sha512
@@ -268,8 +297,8 @@ _mkchecksum () {
     _msg_info "Done!"
 }
 
-_mksignature () {
-    _msg_info "Creating signature file..."
+_mksignature() {
+    _msg_info "Signing SquashFS image..."
     cd -- "${isofs_dir}/${install_dir}/${arch}"
     gpg --detach-sign --default-key "${gpg_key}" airootfs.sfs
     cd -- "${OLDPWD}"
@@ -294,10 +323,12 @@ _make_pacman_conf() {
 
 # Prepare working directory and copy custom airootfs files (airootfs)
 _make_custom_airootfs() {
-    mkdir -m 755 -- "${airootfs_dir}"
-
     local passwd=()
+
+    install -d -m 0755 -o 0 -g 0 -- "${airootfs_dir}"
+
     if [[ -d "${profile}/airootfs" ]]; then
+        _msg_info "Copying custom custom airootfs files and setting up user home directories..."
         cp -af --no-preserve=ownership -- "${profile}/airootfs/." "${airootfs_dir}"
 
         [[ -e "${airootfs_dir}/etc/shadow" ]] && chmod -f 0400 -- "${airootfs_dir}/etc/shadow"
@@ -317,6 +348,7 @@ _make_custom_airootfs() {
                 fi
              done < "${airootfs_dir}/etc/passwd"
         fi
+        _msg_info "Done!"
     fi
 }
 
@@ -336,23 +368,26 @@ _make_packages() {
 # Customize installation (airootfs)
 _make_customize_airootfs() {
     local passwd=()
+
     if [[ -e "${profile}/airootfs/etc/passwd" ]]; then
+        _msg_info "Copying /etc/skel/* to user homes..."
         while IFS=':' read -a passwd -r; do
-            if [[ "${passwd[5]}" == '/' ]]; then
-                continue
-            fi
+            [[ "${passwd[5]}" == '/' ]] && continue
+            [[ -z "${passwd[5]}" ]] && continue
             cp -RdT --preserve=mode,timestamps,links -- "${airootfs_dir}/etc/skel" "${airootfs_dir}${passwd[5]}"
             chown -hR -- "${passwd[2]}:${passwd[3]}" "${airootfs_dir}${passwd[5]}"
 
         done < "${profile}/airootfs/etc/passwd"
+        _msg_info "Done!"
     fi
 
     if [[ -e "${airootfs_dir}/root/customize_airootfs.sh" ]]; then
+        _msg_info "Running customize_airootfs.sh in '${airootfs_dir}' chroot..."
         _msg_warning "customize_airootfs.sh is deprecated! Support for it will be removed in a future archiso version."
         local run_cmd="/root/customize_airootfs.sh"
-        local work_dir="${work_dir}/${arch}"
-        command_run
+        _chroot_run
         rm -- "${airootfs_dir}/root/customize_airootfs.sh"
+        _msg_info "Done! customize_airootfs.sh run successfully."
     fi
 }
 
@@ -370,26 +405,29 @@ _make_bootmodes() {
 
 # Prepare kernel/initramfs ${install_dir}/boot/
 _make_boot_on_iso() {
-    mkdir -p -- "${isofs_dir}/${install_dir}/boot/${arch}"
+    _msg_info "Preparing kernel and intramfs for the ISO 9660 file system..."
+    install -d -m 0755 -- "${isofs_dir}/${install_dir}/boot/${arch}"
     install -m 0644 -- "${airootfs_dir}/boot/archiso.img" "${isofs_dir}/${install_dir}/boot/${arch}/"
     install -m 0644 -- "${airootfs_dir}/boot/vmlinuz-linux" "${isofs_dir}/${install_dir}/boot/${arch}/"
     if [[ -e "${airootfs_dir}/boot/intel-ucode.img" ]]; then
         install -m 0644 -- "${airootfs_dir}/boot/intel-ucode.img" "${isofs_dir}/${install_dir}/boot/"
-        mkdir -p "${isofs_dir}/${install_dir}/boot/licenses/intel-ucode/"
+        install -d -m 0755 -- "${isofs_dir}/${install_dir}/boot/licenses/intel-ucode/"
         install -m 0644 -- "${airootfs_dir}/usr/share/licenses/intel-ucode/"* \
             "${isofs_dir}/${install_dir}/boot/licenses/intel-ucode/"
     fi
     if [[ -e "${airootfs_dir}/boot/amd-ucode.img" ]]; then
         install -m 0644 -- "${airootfs_dir}/boot/amd-ucode.img" "${isofs_dir}/${install_dir}/boot/"
-        mkdir -p "${isofs_dir}/${install_dir}/boot/licenses/amd-ucode/"
+        install -d -m 0755 -- "${isofs_dir}/${install_dir}/boot/licenses/amd-ucode/"
         install -m 0644 -- "${airootfs_dir}/usr/share/licenses/amd-ucode/"* \
             "${isofs_dir}/${install_dir}/boot/licenses/amd-ucode/"
     fi
+    _msg_info "Done!"
 }
 
 # Prepare /${install_dir}/boot/syslinux
 _make_boot_bios.syslinux.mbr() {
-    mkdir -p "${isofs_dir}/${install_dir}/boot/syslinux"
+    _msg_info "Setting up SYSLINUX for BIOS booting from a disk..."
+    install -d -m 0755 -- "${isofs_dir}/${install_dir}/boot/syslinux"
     for _cfg in "${profile}/syslinux/"*.cfg; do
         sed "s|%ARCHISO_LABEL%|${iso_label}|g;
              s|%INSTALL_DIR%|${install_dir}|g;
@@ -403,10 +441,10 @@ _make_boot_bios.syslinux.mbr() {
     install -m 0644 -- "${airootfs_dir}/usr/lib/syslinux/bios/lpxelinux.0" "${isofs_dir}/${install_dir}/boot/syslinux/"
     install -m 0644 -- "${airootfs_dir}/usr/lib/syslinux/bios/memdisk" "${isofs_dir}/${install_dir}/boot/syslinux/"
 
-    _make_boot_on_iso
+    _run_once _make_boot_on_iso
     _uname_r=$(file -b "${isofs_dir}/${install_dir}/boot/${arch}/vmlinuz-linux" | awk 'f{print;f=0} /version/{f=1}' RS=' ')
 
-    mkdir -p "${isofs_dir}/${install_dir}/boot/syslinux/hdt"
+    install -d -m 0755 -- "${isofs_dir}/${install_dir}/boot/syslinux/hdt"
     gzip -c -9 "${airootfs_dir}/usr/share/hwdata/pci.ids" > \
         "${isofs_dir}/${install_dir}/boot/syslinux/hdt/pciids.gz"
     gzip -c -9 "${airootfs_dir}/usr/lib/modules/${_uname_r}/modules.alias" > \
@@ -416,15 +454,17 @@ _make_boot_bios.syslinux.mbr() {
     if [[ -e "${airootfs_dir}/boot/memtest86+/memtest.bin" ]]; then
         # rename for PXE: https://wiki.archlinux.org/index.php/Syslinux#Using_memtest
         install -m 0644 -- "${airootfs_dir}/boot/memtest86+/memtest.bin" "${isofs_dir}/${install_dir}/boot/memtest"
-        mkdir -p "${isofs_dir}/${install_dir}/boot/licenses/memtest86+/"
+        install -d -m 0755 -- "${isofs_dir}/${install_dir}/boot/licenses/memtest86+/"
         install -m 0644 -- "${airootfs_dir}/usr/share/licenses/common/GPL2/license.txt" \
             "${isofs_dir}/${install_dir}/boot/licenses/memtest86+/"
     fi
+    _msg_info "Done! SYSLINUX set up for BIOS booting from a disk successfully."
 }
 
 # Prepare /isolinux
 _make_boot_bios.syslinux.eltorito() {
-    mkdir -p "${isofs_dir}/isolinux"
+    _msg_info "Setting up SYSLINUX for BIOS booting from an optical disc..."
+    install -d -m 0755 -- "${isofs_dir}/isolinux"
     sed "s|%ARCHISO_LABEL%|${iso_label}|g;
          s|%INSTALL_DIR%|${install_dir}|g;
          s|%ARCH%|${arch}|g" \
@@ -435,15 +475,18 @@ _make_boot_bios.syslinux.eltorito() {
 
     # isolinux.cfg loads syslinux.cfg
     _run_once _make_boot_bios.syslinux.mbr
+
+    _msg_info "Done! SYSLINUX set up for BIOS booting from an optical disc successfully."
 }
 
 # Prepare /EFI on ISO-9660
 _make_efi() {
-    mkdir -p "${isofs_dir}/EFI/BOOT"
+    _msg_info "Preparing an /EFI directory for the ISO 9660 file system..."
+    install -d -m 0755 -- "${isofs_dir}/EFI/BOOT"
     install -m 0644 -- "${airootfs_dir}/usr/lib/systemd/boot/efi/systemd-bootx64.efi" \
         "${isofs_dir}/EFI/BOOT/BOOTx64.EFI"
 
-    mkdir -p "${isofs_dir}/loader/entries"
+    install -d -m 0755 -- "${isofs_dir}/loader/entries"
     install -m 0644 -- "${profile}/efiboot/loader/loader.conf" "${isofs_dir}/loader/"
 
     sed "s|%ARCHISO_LABEL%|${iso_label}|g;
@@ -457,51 +500,56 @@ _make_efi() {
     if [[ -e "${airootfs_dir}/usr/share/edk2-shell/x64/Shell_Full.efi" ]]; then
         install -m 0644 -- "${airootfs_dir}/usr/share/edk2-shell/x64/Shell_Full.efi" "${isofs_dir}/shellx64.efi"
     fi
+    _msg_info "Done!"
 }
 
 # Prepare kernel/initramfs on efiboot.img
 _make_boot_on_fat() {
-    mkdir -p "${work_dir}/efiboot/EFI/archiso"
-    install -m 0644 -- "${airootfs_dir}/boot/vmlinuz-linux" "${work_dir}/efiboot/EFI/archiso/"
-    install -m 0644 -- "${isofs_dir}/${install_dir}/boot/${arch}/archiso.img" "${work_dir}/efiboot/EFI/archiso/"
+    _msg_info "Preparing kernel and intramfs for the FAT file system..."
+    install -d -m 0755 -- "${work_dir}/mnt/efiboot/EFI/archiso"
+    install -m 0644 -- "${airootfs_dir}/boot/vmlinuz-linux" "${work_dir}/mnt/efiboot/EFI/archiso/"
+    install -m 0644 -- "${airootfs_dir}/boot/archiso.img" "${work_dir}/mnt/efiboot/EFI/archiso/"
     if [[ -e "${airootfs_dir}/boot/intel-ucode.img" ]]; then
-        install -m 0644 -- "${airootfs_dir}/boot/intel-ucode.img" "${work_dir}/efiboot/EFI/archiso/"
+        install -m 0644 -- "${airootfs_dir}/boot/intel-ucode.img" "${work_dir}/mnt/efiboot/EFI/archiso/"
     fi
     if [[ -e "${airootfs_dir}/boot/amd-ucode.img" ]]; then
-        install -m 0644 -- "${airootfs_dir}/boot/amd-ucode.img" "${work_dir}/efiboot/EFI/archiso/"
+        install -m 0644 -- "${airootfs_dir}/boot/amd-ucode.img" "${work_dir}/mnt/efiboot/EFI/archiso/"
     fi
+    _msg_info "Done!"
 }
 
 # Prepare efiboot.img::/EFI for EFI boot mode
 _make_boot_uefi-x64.systemd-boot.esp() {
-    mkdir -p "${isofs_dir}/EFI/archiso"
+    _msg_info "Setting up systemd-boot for UEFI booting..."
+    install -d -m 0755 -- "${isofs_dir}/EFI/archiso"
     mkfs.fat -C -n ARCHISO_EFI "${isofs_dir}/EFI/archiso/efiboot.img" 65536
 
-    mkdir -p "${work_dir}/efiboot"
-    mount "${isofs_dir}/EFI/archiso/efiboot.img" "${work_dir}/efiboot"
+    _mount_efibootimg
 
-    mkdir -p "${work_dir}/efiboot/EFI/BOOT"
+    install -d -m 0755 -- "${work_dir}/mnt/efiboot/EFI/BOOT"
     install -m 0644 -- "${airootfs_dir}/usr/lib/systemd/boot/efi/systemd-bootx64.efi" \
-        "${work_dir}/efiboot/EFI/BOOT/BOOTx64.EFI"
+        "${work_dir}/mnt/efiboot/EFI/BOOT/BOOTx64.EFI"
 
-    mkdir -p "${work_dir}/efiboot/loader/entries"
-    install -m 0644 -- "${profile}/efiboot/loader/loader.conf" "${work_dir}/efiboot/loader/"
+    install -d -m 0755 -- "${work_dir}/mnt/efiboot/loader/entries"
+    install -m 0644 -- "${profile}/efiboot/loader/loader.conf" "${work_dir}/mnt/efiboot/loader/"
 
     sed "s|%ARCHISO_LABEL%|${iso_label}|g;
          s|%INSTALL_DIR%|${install_dir}|g;
          s|%ARCH%|${arch}|g" \
         "${profile}/efiboot/loader/entries/archiso-x86_64-cd.conf" > \
-        "${work_dir}/efiboot/loader/entries/archiso-x86_64.conf"
+        "${work_dir}/mnt/efiboot/loader/entries/archiso-x86_64.conf"
 
     # shellx64.efi is picked up automatically when on /
     if [[ -e "${airootfs_dir}/usr/share/edk2-shell/x64/Shell_Full.efi" ]]; then
-        install -m 0644 -- "${airootfs_dir}/usr/share/edk2-shell/x64/Shell_Full.efi" "${work_dir}/efiboot/shellx64.efi"
+        install -m 0644 -- "${airootfs_dir}/usr/share/edk2-shell/x64/Shell_Full.efi" "${work_dir}/mnt/efiboot/shellx64.efi"
     fi
 
     # Copy kernel and initramfs
-    _make_boot_on_fat
+    _run_once _make_boot_on_fat
+
+    _umount_efibootimg
 
-    umount -d "${work_dir}/efiboot"
+    _msg_info "Done! systemd-boot set up for UEFI booting successfully."
 }
 
 # Prepare efiboot.img::/EFI for "El Torito" EFI boot mode
@@ -528,6 +576,8 @@ _make_prepare() {
 _make_iso() {
     local xorrisofs_options=()
 
+    [[ -d "${out_dir}" ]] || install -d -- "${out_dir}"
+
     if [[ "${quiet}" == "y" ]]; then
         xorrisofs_options+=('-quiet')
     fi
@@ -570,11 +620,12 @@ _make_iso() {
             "${xorrisofs_options[@]}" \
             -output "${out_dir}/${img_name}" \
             "${isofs_dir}/"
-    _msg_info "Done! | $(du -h -- "${out_dir}/${img_name}")"
+    _msg_info "Done!"
+    du -h -- "${out_dir}/${img_name}"
 }
 
 # Read profile's values from profiledef.sh
-_read_profile () {
+_read_profile() {
     if [[ -z "${profile}" ]]; then
         _msg_error "No profile specified!" 1
     fi
@@ -583,10 +634,11 @@ _read_profile () {
     elif [[ ! -e "${profile}/profiledef.sh" ]]; then
         _msg_error "Profile '${profile}' is missing 'profiledef.sh'!" 1
     else
+        cd -- "${profile}"
+
         # Source profile's variables
         # shellcheck source=configs/releng/profiledef.sh
         . "${profile}/profiledef.sh"
-        cd -- "${profile}"
 
         # Resolve paths
         packages="$(realpath -- "${profile}/packages.${arch}")"
@@ -595,40 +647,11 @@ _read_profile () {
         # Enumerate packages
         [[ -e "${packages}" ]] || _msg_error "File '${packages}' does not exist!" 1
         mapfile -t pkg_list < <(sed '/^[[:blank:]]*#.*/d;s/#.*//;/^[[:blank:]]*$/d' "${packages}")
-        if (( ${#pkg_list[@]} == 0 )); then
-            _msg_error "'${packages}' does not list any packages!" 1
-        fi
 
         cd -- "${OLDPWD}"
     fi
 }
 
-_set_up_directories() {
-    local directory
-    for directory in "${work_dir}" "${out_dir}" "${work_dir}/${arch}" "${isofs_dir}" "${isofs_dir}/${install_dir}"; do
-        [[ -d "${directory}" ]] || mkdir -m 0755 -- "${directory}"
-    done
-}
-
-_print_settings() {
-    _msg_info "${app_name} configuration settings"
-    _msg_info "    Command:                   ${command_name}"
-    _msg_info "    Working directory:         ${work_dir}"
-    _msg_info "    Output directory:          ${out_dir}"
-    _msg_info "    GPG key:                   ${gpg_key:-None}"
-    _msg_info "Profile configuration settings"
-    _msg_info "    Profile:                   ${profile}"
-    _msg_info "    Architecture:              ${arch}"
-    _msg_info "    Image name:                ${img_name}"
-    _msg_info "    Disk label:                ${iso_label}"
-    _msg_info "    Disk publisher:            ${iso_publisher}"
-    _msg_info "    Disk application:          ${iso_application}"
-    _msg_info "    Installation directory:    ${install_dir}"
-    _msg_info "    Pacman config file:        ${pacman_conf}"
-    _msg_info "    Packages:                  ${pkg_list[*]}"
-    _msg_info "    Boot modes:                ${bootmodes[*]}"
-}
-
 _export_gpg_publickey() {
     if [[ -n "${gpg_key}" ]]; then
         gpg --batch --output "${work_dir}/pubkey.gpg" --export "${gpg_key}"
@@ -637,18 +660,19 @@ _export_gpg_publickey() {
 
 
 _make_pkglist() {
+    install -d -m 0755 -- "${isofs_dir}/${install_dir}"
     _msg_info "Creating a list of installed packages on live-enviroment..."
     pacman -Q --sysroot "${airootfs_dir}" > "${isofs_dir}/${install_dir}/pkglist.${arch}.txt"
     _msg_info "Done!"
 }
 
-command_pkglist () {
-    _show_config pkglist
+command_pkglist() {
+    _show_config "${FUNCNAME[0]#command_}"
     _make_pkglist
 }
 
 # Create an ISO9660 filesystem from "iso" directory.
-command_iso () {
+command_iso() {
     bootmodes=('bios.syslinux.mbr' 'bios.syslinux.eltorito')
 
     # If exists, add an EFI "El Torito" boot image (FAT filesystem) to ISO-9660 image.
@@ -656,14 +680,13 @@ command_iso () {
         bootmodes+=('uefi-x64.systemd-boot.esp' 'uefi-x64.systemd-boot.eltorito')
     fi
 
-    _show_config iso
-    mkdir -p -- "${out_dir}"
+    _show_config "${FUNCNAME[0]#command_}"
     _make_iso
 }
 
 # create airootfs.sfs filesystem, and push it in "iso" directory.
-command_prepare () {
-    _show_config prepare
+command_prepare() {
+    _show_config "${FUNCNAME[0]#command_}"
 
     _cleanup
     _make_prepare
@@ -671,7 +694,7 @@ command_prepare () {
 
 # Install packages on airootfs.
 # A basic check to avoid double execution/reinstallation is done via hashing package names.
-command_install () {
+command_install() {
     if [[ ! -f "${pacman_conf}" ]]; then
         _msg_error "Pacman config file '${pacman_conf}' does not exist" 1
     fi
@@ -681,18 +704,18 @@ command_install () {
         _usage 1
     fi
 
-    _show_config install
+    _show_config "${FUNCNAME[0]#command_}"
 
     _make_packages
 }
 
 command_init() {
-    _show_config init
+    _show_config "${FUNCNAME[0]#command_}"
     _chroot_init
 }
 
 command_run() {
-    _show_config run
+    _show_config "${FUNCNAME[0]#command_}"
     _chroot_run
 }
 
@@ -703,8 +726,11 @@ command_build_profile() {
     # Set ISO file name
     img_name="${iso_name}-${iso_version}-${arch}.iso"
 
-    _print_settings
-    _run_once _set_up_directories
+    _show_config "${FUNCNAME[0]#command_}"
+
+    # Create working directory
+    [[ -d "${work_dir}" ]] || install -d -- "${work_dir}"
+
     _run_once _make_pacman_conf
     _run_once _export_gpg_publickey
     _run_once _make_custom_airootfs
@@ -717,7 +743,7 @@ command_build_profile() {
     _run_once _make_iso
 }
 
-while getopts 'B:p:r:C:L:P:A:D:w:o:s:c:g:vh' arg; do
+while getopts 'B:p:r:C:L:P:A:D:w:o:s:c:g:vh:?' arg; do
     case "${arg}" in
         B)
             profile="$(realpath -- "${OPTARG}")"
@@ -759,7 +785,7 @@ if (( $# < 1 )); then
 fi
 command_name="${1}"
 
-# Set directory path defaults
+# Set directory path defaults for legacy commands
 airootfs_dir="${work_dir}/airootfs"
 isofs_dir="${work_dir}/iso"
 
-- 
cgit v1.2.3-70-g09d2


From d90184a7f06c277b0749833c1690a31abfdca2fd Mon Sep 17 00:00:00 2001
From: David Runge <dvzrv@archlinux.org>
Date: Mon, 24 Aug 2020 17:53:10 +0200
Subject: Pass profile directory as parameter to mkarchiso

**archiso/mkarchiso**:

Change all override option parameters (i.e. `-A`, `-C`, `-D`, `-L`, `-P` and `-g`) to not directly override the global
variable they are tied to, but instead using an `override_` prefixed variable.

Add `_set_overrides()` to use `override_` prefixed variables (if set) to override those without a prefix.

Remove `-B` (a profile directory) from the list of parameters. The profile directory is now provided as separate
non-option parameter.

Add a call to `_read_profile()`, `_set_overrides()` and `command_build_profile()` to the fallthrough option of the
switch-case checking `command_name` - a non-option parameter to mkarchiso. This effectively provides the possibility to
set the profile directory using a non-option parameter, while still maintaining compatibility to legacy named arguments
used in the configs' `build.sh` scripts.

Extend the warning in regards to legacy `build.sh` based commands to mkarchiso by providing an EOL with archiso v49.

Change the help output to reflect the changes and further elaborate on the legacy commands used by `build.sh` scripts.

Change help output to be ordered alphabetically.

Add help output for `-r` and `-g` options.

Call `_set_overrides()` for legacy commands that accept one or more of the overriden options (i.e. `command_init`,
`command_install`, `command_prepare` and `command_iso`).

Various style fixes.

**configs/{baseline,releng}/build.sh**:

Change call to mkarchiso to use the profile's directory as a named argument instead of an option-argument.

**README.rst**:

Fix documentation on how to call mkarchiso with a profile directory.

Fix wording and ordering of option arguments for run_archiso documentation.

Fixes #52
---
 README.rst                |  10 ++--
 archiso/mkarchiso         | 150 ++++++++++++++++++++++++++++++----------------
 configs/baseline/build.sh |   2 +-
 configs/releng/build.sh   |   2 +-
 4 files changed, 105 insertions(+), 59 deletions(-)

(limited to 'archiso/mkarchiso')

diff --git a/README.rst b/README.rst
index 4c17082..c4774c0 100644
--- a/README.rst
+++ b/README.rst
@@ -49,7 +49,7 @@ be lost on update).
 
 The examples below will assume an unmodified profile in a system location (unless noted otherwise).
 
-It is advised to check the help information of the **mkarchiso**:
+It is advised to consult the help output of **mkarchiso**:
 
   .. code:: bash
 
@@ -60,7 +60,7 @@ Create images with packaged archiso
 
   .. code:: bash
 
-    mkarchiso -B path/to/profile -w path/to/work_dir -o path/to/out_dir build_profile
+    mkarchiso -w path/to/work_dir -o path/to/out_dir path/to/profile
 
 Create images with local clone
 ------------------------------
@@ -69,13 +69,13 @@ Clone this repository and run:
 
   .. code:: bash
 
-    ./archiso/mkarchiso -B path/to/profile -w path/to/work_dir -o path/to/out_dir build_profile
+    ./archiso/mkarchiso -w path/to/work_dir -o path/to/out_dir path/to/profile
 
 Testing
 =======
 
 The convenience script **run_archiso** is provided to boot into the medium using qemu.
-It is advised to read its help information:
+It is advised to consult its help output:
 
   .. code:: bash
 
@@ -91,7 +91,7 @@ Run the following to boot the iso using UEFI:
 
   .. code:: bash
 
-    run_archiso -i path/to/an/arch.iso -u
+    run_archiso -u -i path/to/an/arch.iso
 
 The script can of course also be executed from this repository:
 
diff --git a/archiso/mkarchiso b/archiso/mkarchiso
index 2ccf7f0..0318aa6 100755
--- a/archiso/mkarchiso
+++ b/archiso/mkarchiso
@@ -20,17 +20,22 @@ img_name="${app_name}.iso"
 sfs_mode="sfs"
 sfs_comp="xz"
 gpg_key=""
+override_gpg_key=""
 
 # profile defaults
 profile=""
 iso_name="${app_name}"
 iso_label="${app_name^^}"
+override_iso_label=""
 iso_publisher="${app_name}"
+override_iso_publisher=""
 iso_application="${app_name} iso"
+override_iso_application=""
 iso_version=""
 install_dir="${app_name}"
 arch="$(uname -m)"
 pacman_conf="/etc/pacman.conf"
+override_pacman_conf=""
 bootmodes=()
 
 
@@ -105,36 +110,52 @@ _umount_efibootimg() {
 # $1: exit status number.
 _usage() {
     IFS='' read -r -d '' usagetext <<ENDUSAGETEXT || true
-usage ${app_name} [options] command <command options>
- general options:
-    -B <profile_dir> Directory of the archiso profile to build
-    -p PACKAGE(S)    Package(s) to install, can be used multiple times
-    -C <file>        pacman configuration file.
-                     Default: '${pacman_conf}'
-    -L <label>       Set the ISO volume label
-                     Default: '${iso_label}'
-    -P <publisher>   Set a ISO publisher
-                     Default: '${iso_publisher}'
-    -A <application> Set an application name for the ISO
-                     Default: '${iso_application}'
-    -D <install_dir> Set an install_dir. All files will by located here.
-                     Default: '${install_dir}'
-                     NOTE: Max 8 characters, use only [a-z0-9]
-    -w <work_dir>    Set the working directory
-                     Default: '${work_dir}'
-    -o <out_dir>     Set the output directory
-                     Default: '${out_dir}'
-    -s <sfs_mode>    Set SquashFS image mode (img or sfs)
-                     img: prepare airootfs.sfs for dm-snapshot usage
-                     sfs: prepare airootfs.sfs for overlayfs usage
-                     Default: '${sfs_mode}'
-    -c <comp_type>   Set SquashFS compression type (gzip, lzma, lzo, xz, zstd)
-                     Default: '${sfs_comp}'
-    -v               Enable verbose output
-    -h               This message
- commands:
-   build_profile
-      build an iso image from a profile
+usage ${app_name} [options] <profile_dir or legacy_command>
+  options:
+     -A <application> Set an application name for the ISO
+                      Default: '${iso_application}'
+     -C <file>        pacman configuration file.
+                      Default: '${pacman_conf}'
+     -D <install_dir> Set an install_dir. All files will by located here.
+                      Default: '${install_dir}'
+                      NOTE: Max 8 characters, use only [a-z0-9]
+     -L <label>       Set the ISO volume label
+                      Default: '${iso_label}'
+     -P <publisher>   Set the ISO publisher
+                      Default: '${iso_publisher}'
+     -c <comp_type>   Set SquashFS compression type (gzip, lzma, lzo, xz, zstd)
+                      Default: '${sfs_comp}'
+     -g <gpg_key>     Set the GPG key to be used for signing the sqashfs image
+     -h               This message
+     -o <out_dir>     Set the output directory
+                      Default: '${out_dir}'
+     -p PACKAGE(S)    Package(s) to install, can be used multiple times
+     -r <run_cmd>     Set a command to be run in chroot (only relevant for for command_run)
+                      NOTE: Deprecated, will be removed with archiso v49
+     -s <sfs_mode>    Set SquashFS image mode (img or sfs)
+                      img: prepare airootfs.sfs for dm-snapshot usage
+                      sfs: prepare airootfs.sfs for overlayfs usage
+                      Default: '${sfs_mode}'
+     -v               Enable verbose output
+     -w <work_dir>    Set the working directory
+                      Default: '${work_dir}'
+
+  profile_dir:        Directory of the archiso profile to build
+
+  legacy_command:     Legacy build.sh command
+                      NOTE: Deprecated, will be removed with archiso v49
+    command_init
+        initialize a chroot for building
+    command_install
+        install packages to the chroot
+    command_run
+        run a command in the chroot
+    command_prepare
+        cleanup and prepare the airootfs
+    command_pkglist
+        create a list of packages installed on the medium
+    command_iso
+        create the ISO
 ENDUSAGETEXT
     printf '%s' "${usagetext}"
     exit "${1}"
@@ -652,6 +673,29 @@ _read_profile() {
     fi
 }
 
+# set overrides from mkarchiso option parameters, if present
+_set_overrides() {
+    if [[ -n "$override_iso_label" ]]; then
+        iso_label="$override_iso_label"
+    fi
+    if [[ -n "$override_iso_publisher" ]]; then
+        iso_publisher="$override_iso_publisher"
+    fi
+    if [[ -n "$override_iso_application" ]]; then
+        iso_application="$override_iso_application"
+    fi
+    if [[ -n "$override_install_dir" ]]; then
+        install_dir="$override_install_dir"
+    fi
+    if [[ -n "$override_pacman_conf" ]]; then
+        pacman_conf="$override_pacman_conf"
+    fi
+    if [[ -n "$override_gpg_key" ]]; then
+        gpg_key="$override_gpg_key"
+    fi
+}
+
+
 _export_gpg_publickey() {
     if [[ -n "${gpg_key}" ]]; then
         gpg --batch --output "${work_dir}/pubkey.gpg" --export "${gpg_key}"
@@ -743,27 +787,23 @@ command_build_profile() {
     _run_once _make_iso
 }
 
-while getopts 'B:p:r:C:L:P:A:D:w:o:s:c:g:vh:?' arg; do
+while getopts 'p:r:C:L:P:A:D:w:o:s:c:g:vh?' arg; do
     case "${arg}" in
-        B)
-            profile="$(realpath -- "${OPTARG}")"
-            _read_profile
-            ;;
         p)
             read -r -a opt_pkg_list <<< "${OPTARG}"
             pkg_list+=("${opt_pkg_list[@]}")
             ;;
         r) run_cmd="${OPTARG}" ;;
-        C) pacman_conf="$(realpath -- "${OPTARG}")" ;;
-        L) iso_label="${OPTARG}" ;;
-        P) iso_publisher="${OPTARG}" ;;
-        A) iso_application="${OPTARG}" ;;
-        D) install_dir="${OPTARG}" ;;
+        C) override_pacman_conf="$(realpath -- "${OPTARG}")" ;;
+        L) override_iso_label="${OPTARG}" ;;
+        P) override_iso_publisher="${OPTARG}" ;;
+        A) override_iso_application="${OPTARG}" ;;
+        D) override_install_dir="${OPTARG}" ;;
         w) work_dir="$(realpath -- "${OPTARG}")" ;;
         o) out_dir="$(realpath -- "${OPTARG}")" ;;
         s) sfs_mode="${OPTARG}" ;;
         c) sfs_comp="${OPTARG}" ;;
-        g) gpg_key="${OPTARG}" ;;
+        g) override_gpg_key="${OPTARG}" ;;
         v) quiet="n" ;;
         h|?) _usage 0 ;;
         *)
@@ -791,40 +831,46 @@ isofs_dir="${work_dir}/iso"
 
 case "${command_name}" in
     init)
-        _msg_warning "The '${command_name}' command is deprecated!"
+        _msg_warning "The '${command_name}' command is deprecated! It will be removed with archiso v49."
+        _set_overrides
         command_init
         ;;
     install)
-        _msg_warning "The '${command_name}' command is deprecated!"
+        _msg_warning "The '${command_name}' command is deprecated! It will be removed with archiso v49."
+        _set_overrides
         command_install
         ;;
     run)
-        _msg_warning "The '${command_name}' command is deprecated!"
+        _msg_warning "The '${command_name}' command is deprecated! It will be removed with archiso v49."
         command_run
         ;;
     prepare)
-        _msg_warning "The '${command_name}' command is deprecated!"
+        _msg_warning "The '${command_name}' command is deprecated! It will be removed with archiso v49."
+        _set_overrides
         command_prepare
         ;;
     pkglist)
-        _msg_warning "The '${command_name}' command is deprecated!"
+        _msg_warning "The '${command_name}' command is deprecated! It will be removed with archiso v49."
         command_pkglist
         ;;
     iso)
-        _msg_warning "The '${command_name}' command is deprecated!"
+        _msg_warning "The '${command_name}' command is deprecated! It will be removed with archiso v49."
         if (( $# < 2 )); then
             _msg_error "No image specified" 0
             _usage 1
         fi
         img_name="${2}"
+        _set_overrides
         command_iso
         ;;
-    build_profile)
-        command_build_profile
-        ;;
     *)
-        _msg_error "Invalid command name '${command_name}'" 0
-        _usage 1
+        # NOTE: we call read_profile here, assuming that the first non-option parameter is a profile directory
+        # This way we can retain backwards compatibility with legacy build.sh scripts until we deprecate the old way of
+        # calling mkarchiso with named parameters in v49
+        profile="$(realpath -- "${command_name}")"
+        _read_profile
+        _set_overrides
+        command_build_profile
         ;;
 esac
 
diff --git a/configs/baseline/build.sh b/configs/baseline/build.sh
index 734ae26..0573599 100755
--- a/configs/baseline/build.sh
+++ b/configs/baseline/build.sh
@@ -4,4 +4,4 @@
 
 printf '\n[%s] WARNING: %s\n\n' "mkarchiso" "build.sh scripts are deprecated! Please use mkarchiso directly." >&2
 _buildsh_path="$(realpath -- "$0")"
-exec mkarchiso "$@" -B "${_buildsh_path%/*}" build_profile
+exec mkarchiso "$@" "${_buildsh_path%/*}"
diff --git a/configs/releng/build.sh b/configs/releng/build.sh
index 734ae26..0573599 100755
--- a/configs/releng/build.sh
+++ b/configs/releng/build.sh
@@ -4,4 +4,4 @@
 
 printf '\n[%s] WARNING: %s\n\n' "mkarchiso" "build.sh scripts are deprecated! Please use mkarchiso directly." >&2
 _buildsh_path="$(realpath -- "$0")"
-exec mkarchiso "$@" -B "${_buildsh_path%/*}" build_profile
+exec mkarchiso "$@" "${_buildsh_path%/*}"
-- 
cgit v1.2.3-70-g09d2


From 4b401931bde9d9caf7348da0d8c883802722f61f Mon Sep 17 00:00:00 2001
From: David Runge <dvzrv@archlinux.org>
Date: Tue, 25 Aug 2020 21:56:41 +0200
Subject: Add missing declaration of override_install_dir

**archiso/mkarchiso**:

In d90184a the unbound variable `override_install_dir` was introduced by accident.

It is required to be set to empty string to provide override functionality for `install_dir`.

Fixes #57
---
 archiso/mkarchiso | 1 +
 1 file changed, 1 insertion(+)

(limited to 'archiso/mkarchiso')

diff --git a/archiso/mkarchiso b/archiso/mkarchiso
index 0318aa6..d2f8feb 100755
--- a/archiso/mkarchiso
+++ b/archiso/mkarchiso
@@ -33,6 +33,7 @@ iso_application="${app_name} iso"
 override_iso_application=""
 iso_version=""
 install_dir="${app_name}"
+override_install_dir=""
 arch="$(uname -m)"
 pacman_conf="/etc/pacman.conf"
 override_pacman_conf=""
-- 
cgit v1.2.3-70-g09d2


From 45a5d229b37eedd7996e88e5f7ef7c9a60969e05 Mon Sep 17 00:00:00 2001
From: nl6720 <nl6720@gmail.com>
Date: Wed, 2 Sep 2020 19:10:07 +0300
Subject: Create directories and copy files to the FAT image using mtools
 instead of mounting the file system

- mtools supports SOURCE_DATE_EPOCH.
- The image file is operated on directly instead of mounting the file system. This is a prerequisite to limit the commands that run with root privileges. Related to https://gitlab.archlinux.org/archlinux/archiso/-/issues/40 .
- Add a reminder comment to not get rid of the dosfstools dependency, since a mformat made FAT image can fail to boot on some systems.
---
 README.rst        |  1 +
 archiso/mkarchiso | 51 +++++++++++++++++----------------------------------
 2 files changed, 18 insertions(+), 34 deletions(-)

(limited to 'archiso/mkarchiso')

diff --git a/README.rst b/README.rst
index c4774c0..cfc47fa 100644
--- a/README.rst
+++ b/README.rst
@@ -15,6 +15,7 @@ The following packages need to be installed to be able to create an image with t
 * dosfstools
 * e2fsprogs
 * libisoburn
+* mtools
 * squashfs-tools
 
 For running the images in a virtualized test environment the following packages are required:
diff --git a/archiso/mkarchiso b/archiso/mkarchiso
index d2f8feb..6c583a5 100755
--- a/archiso/mkarchiso
+++ b/archiso/mkarchiso
@@ -91,22 +91,6 @@ _umount_airootfs() {
     trap - EXIT HUP INT TERM
 }
 
-_mount_efibootimg() {
-    trap "_umount_efibootimg" EXIT HUP INT TERM
-    install -d -m 0755 -- "${work_dir}/mnt/efiboot"
-    _msg_info "Mounting '${isofs_dir}/EFI/archiso/efiboot.img' on '${work_dir}/mnt/efiboot'..."
-    mount -- "${isofs_dir}/EFI/archiso/efiboot.img" "${work_dir}/mnt/efiboot"
-    _msg_info "Done!"
-}
-
-_umount_efibootimg() {
-    _msg_info "Unmounting '${work_dir}/mnt/efiboot'..."
-    umount -d -- "${work_dir}/mnt/efiboot"
-    _msg_info "Done!"
-    rmdir -- "${work_dir}/mnt/efiboot"
-    trap - EXIT HUP INT TERM
-}
-
 # Show help usage, with an exit status.
 # $1: exit status number.
 _usage() {
@@ -528,14 +512,14 @@ _make_efi() {
 # Prepare kernel/initramfs on efiboot.img
 _make_boot_on_fat() {
     _msg_info "Preparing kernel and intramfs for the FAT file system..."
-    install -d -m 0755 -- "${work_dir}/mnt/efiboot/EFI/archiso"
-    install -m 0644 -- "${airootfs_dir}/boot/vmlinuz-linux" "${work_dir}/mnt/efiboot/EFI/archiso/"
-    install -m 0644 -- "${airootfs_dir}/boot/archiso.img" "${work_dir}/mnt/efiboot/EFI/archiso/"
+    mmd -i "${isofs_dir}/EFI/archiso/efiboot.img" ::/EFI/archiso
+    mcopy -i "${isofs_dir}/EFI/archiso/efiboot.img" \
+        "${airootfs_dir}/boot/vmlinuz-linux" "${airootfs_dir}/boot/archiso.img" ::/EFI/archiso/
     if [[ -e "${airootfs_dir}/boot/intel-ucode.img" ]]; then
-        install -m 0644 -- "${airootfs_dir}/boot/intel-ucode.img" "${work_dir}/mnt/efiboot/EFI/archiso/"
+        mcopy -i "${isofs_dir}/EFI/archiso/efiboot.img" "${airootfs_dir}/boot/intel-ucode.img" ::/EFI/archiso/
     fi
     if [[ -e "${airootfs_dir}/boot/amd-ucode.img" ]]; then
-        install -m 0644 -- "${airootfs_dir}/boot/amd-ucode.img" "${work_dir}/mnt/efiboot/EFI/archiso/"
+        mcopy -i "${isofs_dir}/EFI/archiso/efiboot.img" "${airootfs_dir}/boot/amd-ucode.img" ::/EFI/archiso/
     fi
     _msg_info "Done!"
 }
@@ -544,33 +528,32 @@ _make_boot_on_fat() {
 _make_boot_uefi-x64.systemd-boot.esp() {
     _msg_info "Setting up systemd-boot for UEFI booting..."
     install -d -m 0755 -- "${isofs_dir}/EFI/archiso"
-    mkfs.fat -C -n ARCHISO_EFI "${isofs_dir}/EFI/archiso/efiboot.img" 65536
-
-    _mount_efibootimg
 
-    install -d -m 0755 -- "${work_dir}/mnt/efiboot/EFI/BOOT"
-    install -m 0644 -- "${airootfs_dir}/usr/lib/systemd/boot/efi/systemd-bootx64.efi" \
-        "${work_dir}/mnt/efiboot/EFI/BOOT/BOOTx64.EFI"
+    # The FAT image must be created with mkfs.fat not mformat, as some systems have issues with mformat made images:
+    # https://lists.gnu.org/archive/html/grub-devel/2019-04/msg00099.html
+    mkfs.fat -C -n ARCHISO_EFI "${isofs_dir}/EFI/archiso/efiboot.img" 65536
 
-    install -d -m 0755 -- "${work_dir}/mnt/efiboot/loader/entries"
-    install -m 0644 -- "${profile}/efiboot/loader/loader.conf" "${work_dir}/mnt/efiboot/loader/"
+    mmd -i "${isofs_dir}/EFI/archiso/efiboot.img" ::/EFI ::/EFI/BOOT
+    mcopy -i "${isofs_dir}/EFI/archiso/efiboot.img" \
+        "${airootfs_dir}/usr/lib/systemd/boot/efi/systemd-bootx64.efi" ::/EFI/BOOT/BOOTx64.EFI
 
+    mmd -i "${isofs_dir}/EFI/archiso/efiboot.img" ::/loader ::/loader/entries
+    mcopy -i "${isofs_dir}/EFI/archiso/efiboot.img" "${profile}/efiboot/loader/loader.conf" ::/loader/
     sed "s|%ARCHISO_LABEL%|${iso_label}|g;
          s|%INSTALL_DIR%|${install_dir}|g;
          s|%ARCH%|${arch}|g" \
-        "${profile}/efiboot/loader/entries/archiso-x86_64-cd.conf" > \
-        "${work_dir}/mnt/efiboot/loader/entries/archiso-x86_64.conf"
+        "${profile}/efiboot/loader/entries/archiso-x86_64-cd.conf" \
+        | mcopy -i "${isofs_dir}/EFI/archiso/efiboot.img" - ::/loader/entries/archiso-x86_64.conf
 
     # shellx64.efi is picked up automatically when on /
     if [[ -e "${airootfs_dir}/usr/share/edk2-shell/x64/Shell_Full.efi" ]]; then
-        install -m 0644 -- "${airootfs_dir}/usr/share/edk2-shell/x64/Shell_Full.efi" "${work_dir}/mnt/efiboot/shellx64.efi"
+        mcopy -i "${isofs_dir}/EFI/archiso/efiboot.img" \
+            "${airootfs_dir}/usr/share/edk2-shell/x64/Shell_Full.efi" ::/shellx64.efi
     fi
 
     # Copy kernel and initramfs
     _run_once _make_boot_on_fat
 
-    _umount_efibootimg
-
     _msg_info "Done! systemd-boot set up for UEFI booting successfully."
 }
 
-- 
cgit v1.2.3-70-g09d2


From 486b1910dd88315dc16d848cfab372eaf07d1641 Mon Sep 17 00:00:00 2001
From: nl6720 <nl6720@gmail.com>
Date: Sun, 30 Aug 2020 18:12:08 +0300
Subject: Do not overwrite existing files when copying from /etc/skel/
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Copy /etc/skel/ only for users with UID in range 1000–60000.
Correct user home directory permission after copying files.
Fixes all /etc/skel issues from https://bugs.archlinux.org/task/67729 .
---
 archiso/mkarchiso | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'archiso/mkarchiso')

diff --git a/archiso/mkarchiso b/archiso/mkarchiso
index 6c583a5..c5169f7 100755
--- a/archiso/mkarchiso
+++ b/archiso/mkarchiso
@@ -378,9 +378,11 @@ _make_customize_airootfs() {
     if [[ -e "${profile}/airootfs/etc/passwd" ]]; then
         _msg_info "Copying /etc/skel/* to user homes..."
         while IFS=':' read -a passwd -r; do
+            (( passwd[2] >= 1000 && passwd[2] < 60000 )) || continue
             [[ "${passwd[5]}" == '/' ]] && continue
             [[ -z "${passwd[5]}" ]] && continue
-            cp -RdT --preserve=mode,timestamps,links -- "${airootfs_dir}/etc/skel" "${airootfs_dir}${passwd[5]}"
+            cp -dnRT --preserve=mode,timestamps,links -- "${airootfs_dir}/etc/skel" "${airootfs_dir}${passwd[5]}"
+            chmod -f 0750 -- "${airootfs_dir}${passwd[5]}"
             chown -hR -- "${passwd[2]}:${passwd[3]}" "${airootfs_dir}${passwd[5]}"
 
         done < "${profile}/airootfs/etc/passwd"
-- 
cgit v1.2.3-70-g09d2


From 136152e672d56fd624a56a32af6f584f66fc50dc Mon Sep 17 00:00:00 2001
From: nl6720 <nl6720@gmail.com>
Date: Wed, 2 Sep 2020 23:38:13 +0300
Subject: Do not rename the initramfs image

This is a breaking change. archweb, archiso-manager and various documentation must be updated.

* https://github.com/archlinux/archweb/blob/master/templates/releng/archlinux.ipxe
* https://github.com/pierres/archiso-manager/blob/master/Makefile
---
 archiso/mkarchiso                                             | 4 ++--
 configs/baseline/airootfs/etc/mkinitcpio.d/linux.preset       | 2 +-
 configs/baseline/syslinux/syslinux.cfg                        | 2 +-
 configs/releng/airootfs/etc/mkinitcpio.d/linux.preset         | 2 +-
 configs/releng/efiboot/loader/entries/archiso-x86_64-cd.conf  | 2 +-
 configs/releng/efiboot/loader/entries/archiso-x86_64-usb.conf | 2 +-
 configs/releng/syslinux/archiso_pxe.cfg                       | 6 +++---
 configs/releng/syslinux/archiso_sys.cfg                       | 2 +-
 8 files changed, 11 insertions(+), 11 deletions(-)

(limited to 'archiso/mkarchiso')

diff --git a/archiso/mkarchiso b/archiso/mkarchiso
index c5169f7..5c124bd 100755
--- a/archiso/mkarchiso
+++ b/archiso/mkarchiso
@@ -415,7 +415,7 @@ _make_bootmodes() {
 _make_boot_on_iso() {
     _msg_info "Preparing kernel and intramfs for the ISO 9660 file system..."
     install -d -m 0755 -- "${isofs_dir}/${install_dir}/boot/${arch}"
-    install -m 0644 -- "${airootfs_dir}/boot/archiso.img" "${isofs_dir}/${install_dir}/boot/${arch}/"
+    install -m 0644 -- "${airootfs_dir}/boot/initramfs-linux.img" "${isofs_dir}/${install_dir}/boot/${arch}/"
     install -m 0644 -- "${airootfs_dir}/boot/vmlinuz-linux" "${isofs_dir}/${install_dir}/boot/${arch}/"
     if [[ -e "${airootfs_dir}/boot/intel-ucode.img" ]]; then
         install -m 0644 -- "${airootfs_dir}/boot/intel-ucode.img" "${isofs_dir}/${install_dir}/boot/"
@@ -516,7 +516,7 @@ _make_boot_on_fat() {
     _msg_info "Preparing kernel and intramfs for the FAT file system..."
     mmd -i "${isofs_dir}/EFI/archiso/efiboot.img" ::/EFI/archiso
     mcopy -i "${isofs_dir}/EFI/archiso/efiboot.img" \
-        "${airootfs_dir}/boot/vmlinuz-linux" "${airootfs_dir}/boot/archiso.img" ::/EFI/archiso/
+        "${airootfs_dir}/boot/vmlinuz-linux" "${airootfs_dir}/boot/initramfs-linux.img" ::/EFI/archiso/
     if [[ -e "${airootfs_dir}/boot/intel-ucode.img" ]]; then
         mcopy -i "${isofs_dir}/EFI/archiso/efiboot.img" "${airootfs_dir}/boot/intel-ucode.img" ::/EFI/archiso/
     fi
diff --git a/configs/baseline/airootfs/etc/mkinitcpio.d/linux.preset b/configs/baseline/airootfs/etc/mkinitcpio.d/linux.preset
index a1949cd..d35f137 100644
--- a/configs/baseline/airootfs/etc/mkinitcpio.d/linux.preset
+++ b/configs/baseline/airootfs/etc/mkinitcpio.d/linux.preset
@@ -8,4 +8,4 @@ PRESETS=('archiso')
 ALL_kver='/boot/vmlinuz-linux'
 ALL_config='/etc/mkinitcpio.conf'
 
-archiso_image="/boot/archiso.img"
+archiso_image="/boot/initramfs-linux.img"
diff --git a/configs/baseline/syslinux/syslinux.cfg b/configs/baseline/syslinux/syslinux.cfg
index a3908da..d7396b8 100644
--- a/configs/baseline/syslinux/syslinux.cfg
+++ b/configs/baseline/syslinux/syslinux.cfg
@@ -11,5 +11,5 @@ TIMEOUT 30
 LABEL arch
 MENU LABEL Arch Linux
 LINUX boot/%ARCH%/vmlinuz-linux
-INITRD boot/%ARCH%/archiso.img
+INITRD boot/%ARCH%/initramfs-linux.img
 APPEND archisobasedir=%INSTALL_DIR% archisolabel=%ARCHISO_LABEL%
diff --git a/configs/releng/airootfs/etc/mkinitcpio.d/linux.preset b/configs/releng/airootfs/etc/mkinitcpio.d/linux.preset
index a1949cd..d35f137 100644
--- a/configs/releng/airootfs/etc/mkinitcpio.d/linux.preset
+++ b/configs/releng/airootfs/etc/mkinitcpio.d/linux.preset
@@ -8,4 +8,4 @@ PRESETS=('archiso')
 ALL_kver='/boot/vmlinuz-linux'
 ALL_config='/etc/mkinitcpio.conf'
 
-archiso_image="/boot/archiso.img"
+archiso_image="/boot/initramfs-linux.img"
diff --git a/configs/releng/efiboot/loader/entries/archiso-x86_64-cd.conf b/configs/releng/efiboot/loader/entries/archiso-x86_64-cd.conf
index 52d9536..a706064 100644
--- a/configs/releng/efiboot/loader/entries/archiso-x86_64-cd.conf
+++ b/configs/releng/efiboot/loader/entries/archiso-x86_64-cd.conf
@@ -5,5 +5,5 @@ title   Arch Linux install medium (x86_64, UEFI)
 linux   /EFI/archiso/vmlinuz-linux
 initrd  /EFI/archiso/intel-ucode.img
 initrd  /EFI/archiso/amd-ucode.img
-initrd  /EFI/archiso/archiso.img
+initrd  /EFI/archiso/initramfs-linux.img
 options archisobasedir=%INSTALL_DIR% archisolabel=%ARCHISO_LABEL%
diff --git a/configs/releng/efiboot/loader/entries/archiso-x86_64-usb.conf b/configs/releng/efiboot/loader/entries/archiso-x86_64-usb.conf
index e1a3908..1a14b11 100644
--- a/configs/releng/efiboot/loader/entries/archiso-x86_64-usb.conf
+++ b/configs/releng/efiboot/loader/entries/archiso-x86_64-usb.conf
@@ -5,5 +5,5 @@ title   Arch Linux install medium (x86_64, UEFI)
 linux   /%INSTALL_DIR%/boot/x86_64/vmlinuz-linux
 initrd  /%INSTALL_DIR%/boot/intel-ucode.img
 initrd  /%INSTALL_DIR%/boot/amd-ucode.img
-initrd  /%INSTALL_DIR%/boot/x86_64/archiso.img
+initrd  /%INSTALL_DIR%/boot/x86_64/initramfs-linux.img
 options archisobasedir=%INSTALL_DIR% archisolabel=%ARCHISO_LABEL%
diff --git a/configs/releng/syslinux/archiso_pxe.cfg b/configs/releng/syslinux/archiso_pxe.cfg
index ed15c7d..e51b55a 100644
--- a/configs/releng/syslinux/archiso_pxe.cfg
+++ b/configs/releng/syslinux/archiso_pxe.cfg
@@ -10,7 +10,7 @@ It allows you to install Arch Linux or perform system maintenance.
 ENDTEXT
 MENU LABEL Arch Linux install medium (x86_64, NBD)
 LINUX boot/x86_64/vmlinuz-linux
-INITRD boot/intel-ucode.img,boot/amd-ucode.img,boot/x86_64/archiso.img
+INITRD boot/intel-ucode.img,boot/amd-ucode.img,boot/x86_64/initramfs-linux.img
 APPEND archisobasedir=%INSTALL_DIR% archisolabel=%ARCHISO_LABEL% archiso_nbd_srv=${pxeserver} checksum verify
 SYSAPPEND 3
 
@@ -21,7 +21,7 @@ It allows you to install Arch Linux or perform system maintenance.
 ENDTEXT
 MENU LABEL Arch Linux install medium (x86_64, NFS)
 LINUX boot/x86_64/vmlinuz-linux
-INITRD boot/intel-ucode.img,boot/amd-ucode.img,boot/x86_64/archiso.img
+INITRD boot/intel-ucode.img,boot/amd-ucode.img,boot/x86_64/initramfs-linux.img
 APPEND archisobasedir=%INSTALL_DIR% archiso_nfs_srv=${pxeserver}:/run/archiso/bootmnt checksum verify
 SYSAPPEND 3
 
@@ -32,7 +32,7 @@ It allows you to install Arch Linux or perform system maintenance.
 ENDTEXT
 MENU LABEL Arch Linux install medium (x86_64, HTTP)
 LINUX boot/x86_64/vmlinuz-linux
-INITRD boot/intel-ucode.img,boot/amd-ucode.img,boot/x86_64/archiso.img
+INITRD boot/intel-ucode.img,boot/amd-ucode.img,boot/x86_64/initramfs-linux.img
 APPEND archisobasedir=%INSTALL_DIR% archiso_http_srv=http://${pxeserver}/ checksum verify
 SYSAPPEND 3
 
diff --git a/configs/releng/syslinux/archiso_sys.cfg b/configs/releng/syslinux/archiso_sys.cfg
index f14d176..6e8d9e3 100644
--- a/configs/releng/syslinux/archiso_sys.cfg
+++ b/configs/releng/syslinux/archiso_sys.cfg
@@ -13,7 +13,7 @@ It allows you to install Arch Linux or perform system maintenance.
 ENDTEXT
 MENU LABEL Arch Linux install medium (x86_64, BIOS)
 LINUX boot/x86_64/vmlinuz-linux
-INITRD boot/intel-ucode.img,boot/amd-ucode.img,boot/x86_64/archiso.img
+INITRD boot/intel-ucode.img,boot/amd-ucode.img,boot/x86_64/initramfs-linux.img
 APPEND archisobasedir=%INSTALL_DIR% archisolabel=%ARCHISO_LABEL%
 
 INCLUDE boot/syslinux/archiso_tail.cfg
-- 
cgit v1.2.3-70-g09d2


From 83e4cb9fb9934611e0508ac4e6ee97a1a0bd2ffc Mon Sep 17 00:00:00 2001
From: nl6720 <nl6720@gmail.com>
Date: Thu, 3 Sep 2020 00:03:38 +0300
Subject: Use the same file paths in both ISO 9660 and FAT

This allows to use only one systemd-boot configuration file per kernel.
Fixes https://gitlab.archlinux.org/archlinux/archiso/-/issues/44 .
---
 archiso/mkarchiso                                     | 19 ++++++++++---------
 .../efiboot/loader/entries/archiso-x86_64-cd.conf     |  9 ---------
 .../efiboot/loader/entries/archiso-x86_64-linux.conf  |  9 +++++++++
 .../efiboot/loader/entries/archiso-x86_64-usb.conf    |  9 ---------
 configs/releng/efiboot/loader/loader.conf             |  2 +-
 5 files changed, 20 insertions(+), 28 deletions(-)
 delete mode 100644 configs/releng/efiboot/loader/entries/archiso-x86_64-cd.conf
 create mode 100644 configs/releng/efiboot/loader/entries/archiso-x86_64-linux.conf
 delete mode 100644 configs/releng/efiboot/loader/entries/archiso-x86_64-usb.conf

(limited to 'archiso/mkarchiso')

diff --git a/archiso/mkarchiso b/archiso/mkarchiso
index 5c124bd..d83ab2f 100755
--- a/archiso/mkarchiso
+++ b/archiso/mkarchiso
@@ -500,8 +500,8 @@ _make_efi() {
     sed "s|%ARCHISO_LABEL%|${iso_label}|g;
          s|%INSTALL_DIR%|${install_dir}|g;
          s|%ARCH%|${arch}|g" \
-        "${profile}/efiboot/loader/entries/archiso-x86_64-usb.conf" > \
-        "${isofs_dir}/loader/entries/archiso-x86_64.conf"
+        "${profile}/efiboot/loader/entries/archiso-x86_64-linux.conf" > \
+        "${isofs_dir}/loader/entries/archiso-x86_64-linux.conf"
 
     # edk2-shell based UEFI shell
     # shellx64.efi is picked up automatically when on /
@@ -514,14 +514,15 @@ _make_efi() {
 # Prepare kernel/initramfs on efiboot.img
 _make_boot_on_fat() {
     _msg_info "Preparing kernel and intramfs for the FAT file system..."
-    mmd -i "${isofs_dir}/EFI/archiso/efiboot.img" ::/EFI/archiso
-    mcopy -i "${isofs_dir}/EFI/archiso/efiboot.img" \
-        "${airootfs_dir}/boot/vmlinuz-linux" "${airootfs_dir}/boot/initramfs-linux.img" ::/EFI/archiso/
+    mmd -i "${isofs_dir}/EFI/archiso/efiboot.img" \
+        "::/${install_dir}" "::/${install_dir}/boot" "::/${install_dir}/boot/${arch}"
+    mcopy -i "${isofs_dir}/EFI/archiso/efiboot.img" "${airootfs_dir}/boot/vmlinuz-linux" \
+        "${airootfs_dir}/boot/initramfs-linux.img" "::/${install_dir}/boot/${arch}/"
     if [[ -e "${airootfs_dir}/boot/intel-ucode.img" ]]; then
-        mcopy -i "${isofs_dir}/EFI/archiso/efiboot.img" "${airootfs_dir}/boot/intel-ucode.img" ::/EFI/archiso/
+        mcopy -i "${isofs_dir}/EFI/archiso/efiboot.img" "${airootfs_dir}/boot/intel-ucode.img" "::/${install_dir}/boot/"
     fi
     if [[ -e "${airootfs_dir}/boot/amd-ucode.img" ]]; then
-        mcopy -i "${isofs_dir}/EFI/archiso/efiboot.img" "${airootfs_dir}/boot/amd-ucode.img" ::/EFI/archiso/
+        mcopy -i "${isofs_dir}/EFI/archiso/efiboot.img" "${airootfs_dir}/boot/amd-ucode.img" "::/${install_dir}/boot/"
     fi
     _msg_info "Done!"
 }
@@ -544,8 +545,8 @@ _make_boot_uefi-x64.systemd-boot.esp() {
     sed "s|%ARCHISO_LABEL%|${iso_label}|g;
          s|%INSTALL_DIR%|${install_dir}|g;
          s|%ARCH%|${arch}|g" \
-        "${profile}/efiboot/loader/entries/archiso-x86_64-cd.conf" \
-        | mcopy -i "${isofs_dir}/EFI/archiso/efiboot.img" - ::/loader/entries/archiso-x86_64.conf
+        "${profile}/efiboot/loader/entries/archiso-x86_64-linux.conf" \
+        | mcopy -i "${isofs_dir}/EFI/archiso/efiboot.img" - ::/loader/entries/archiso-x86_64-linux.conf
 
     # shellx64.efi is picked up automatically when on /
     if [[ -e "${airootfs_dir}/usr/share/edk2-shell/x64/Shell_Full.efi" ]]; then
diff --git a/configs/releng/efiboot/loader/entries/archiso-x86_64-cd.conf b/configs/releng/efiboot/loader/entries/archiso-x86_64-cd.conf
deleted file mode 100644
index a706064..0000000
--- a/configs/releng/efiboot/loader/entries/archiso-x86_64-cd.conf
+++ /dev/null
@@ -1,9 +0,0 @@
-#
-# SPDX-License-Identifier: GPL-3.0-or-later
-
-title   Arch Linux install medium (x86_64, UEFI)
-linux   /EFI/archiso/vmlinuz-linux
-initrd  /EFI/archiso/intel-ucode.img
-initrd  /EFI/archiso/amd-ucode.img
-initrd  /EFI/archiso/initramfs-linux.img
-options archisobasedir=%INSTALL_DIR% archisolabel=%ARCHISO_LABEL%
diff --git a/configs/releng/efiboot/loader/entries/archiso-x86_64-linux.conf b/configs/releng/efiboot/loader/entries/archiso-x86_64-linux.conf
new file mode 100644
index 0000000..1a14b11
--- /dev/null
+++ b/configs/releng/efiboot/loader/entries/archiso-x86_64-linux.conf
@@ -0,0 +1,9 @@
+#
+# SPDX-License-Identifier: GPL-3.0-or-later
+
+title   Arch Linux install medium (x86_64, UEFI)
+linux   /%INSTALL_DIR%/boot/x86_64/vmlinuz-linux
+initrd  /%INSTALL_DIR%/boot/intel-ucode.img
+initrd  /%INSTALL_DIR%/boot/amd-ucode.img
+initrd  /%INSTALL_DIR%/boot/x86_64/initramfs-linux.img
+options archisobasedir=%INSTALL_DIR% archisolabel=%ARCHISO_LABEL%
diff --git a/configs/releng/efiboot/loader/entries/archiso-x86_64-usb.conf b/configs/releng/efiboot/loader/entries/archiso-x86_64-usb.conf
deleted file mode 100644
index 1a14b11..0000000
--- a/configs/releng/efiboot/loader/entries/archiso-x86_64-usb.conf
+++ /dev/null
@@ -1,9 +0,0 @@
-#
-# SPDX-License-Identifier: GPL-3.0-or-later
-
-title   Arch Linux install medium (x86_64, UEFI)
-linux   /%INSTALL_DIR%/boot/x86_64/vmlinuz-linux
-initrd  /%INSTALL_DIR%/boot/intel-ucode.img
-initrd  /%INSTALL_DIR%/boot/amd-ucode.img
-initrd  /%INSTALL_DIR%/boot/x86_64/initramfs-linux.img
-options archisobasedir=%INSTALL_DIR% archisolabel=%ARCHISO_LABEL%
diff --git a/configs/releng/efiboot/loader/loader.conf b/configs/releng/efiboot/loader/loader.conf
index fd7db27..1ea5ce5 100644
--- a/configs/releng/efiboot/loader/loader.conf
+++ b/configs/releng/efiboot/loader/loader.conf
@@ -2,4 +2,4 @@
 # SPDX-License-Identifier: GPL-3.0-or-later
 
 timeout 3
-default archiso-x86_64.conf
+default archiso-x86_64-linux.conf
-- 
cgit v1.2.3-70-g09d2


From 8276616f6f0480464b2dabf508b3592f19d2ebc2 Mon Sep 17 00:00:00 2001
From: nl6720 <nl6720@gmail.com>
Date: Wed, 2 Sep 2020 23:45:18 +0300
Subject: archiso/mkarchiso: do not hardcode the kernel and initramfs file
 names

All kernels and initramfs images from airootfs are copied to ${install_dir}/boot/ on both ISO 9660 and FAT.
This allows providing multiple kernels. The kernel package needs to be added to packages.x86_64 and the boot loader configuration files created/adjusted appropriately.

Support all possible microcode initrd file names.
---
 archiso/mkarchiso | 94 +++++++++++++++++++++++++++++++------------------------
 1 file changed, 53 insertions(+), 41 deletions(-)

(limited to 'archiso/mkarchiso')

diff --git a/archiso/mkarchiso b/archiso/mkarchiso
index d83ab2f..3e33468 100755
--- a/archiso/mkarchiso
+++ b/archiso/mkarchiso
@@ -413,22 +413,22 @@ _make_bootmodes() {
 
 # Prepare kernel/initramfs ${install_dir}/boot/
 _make_boot_on_iso() {
+    local ucode_image
     _msg_info "Preparing kernel and intramfs for the ISO 9660 file system..."
     install -d -m 0755 -- "${isofs_dir}/${install_dir}/boot/${arch}"
-    install -m 0644 -- "${airootfs_dir}/boot/initramfs-linux.img" "${isofs_dir}/${install_dir}/boot/${arch}/"
-    install -m 0644 -- "${airootfs_dir}/boot/vmlinuz-linux" "${isofs_dir}/${install_dir}/boot/${arch}/"
-    if [[ -e "${airootfs_dir}/boot/intel-ucode.img" ]]; then
-        install -m 0644 -- "${airootfs_dir}/boot/intel-ucode.img" "${isofs_dir}/${install_dir}/boot/"
-        install -d -m 0755 -- "${isofs_dir}/${install_dir}/boot/licenses/intel-ucode/"
-        install -m 0644 -- "${airootfs_dir}/usr/share/licenses/intel-ucode/"* \
-            "${isofs_dir}/${install_dir}/boot/licenses/intel-ucode/"
-    fi
-    if [[ -e "${airootfs_dir}/boot/amd-ucode.img" ]]; then
-        install -m 0644 -- "${airootfs_dir}/boot/amd-ucode.img" "${isofs_dir}/${install_dir}/boot/"
-        install -d -m 0755 -- "${isofs_dir}/${install_dir}/boot/licenses/amd-ucode/"
-        install -m 0644 -- "${airootfs_dir}/usr/share/licenses/amd-ucode/"* \
-            "${isofs_dir}/${install_dir}/boot/licenses/amd-ucode/"
-    fi
+    install -m 0644 -- "${airootfs_dir}/boot/initramfs-"*".img" "${isofs_dir}/${install_dir}/boot/${arch}/"
+    install -m 0644 -- "${airootfs_dir}/boot/vmlinuz-"* "${isofs_dir}/${install_dir}/boot/${arch}/"
+
+    for ucode_image in {intel-uc.img,intel-ucode.img,amd-uc.img,amd-ucode.img,early_ucode.cpio,microcode.cpio}; do
+        if [[ -e "${airootfs_dir}/boot/${ucode_image}" ]]; then
+            install -m 0644 -- "${airootfs_dir}/boot/${ucode_image}" "${isofs_dir}/${install_dir}/boot/"
+            if [[ -e "${airootfs_dir}/usr/share/licenses/${ucode_image%.*}/" ]]; then
+                install -d -m 0755 -- "${isofs_dir}/${install_dir}/boot/licenses/${ucode_image%.*}/"
+                install -m 0644 -- "${airootfs_dir}/usr/share/licenses/${ucode_image%.*}/"* \
+                    "${isofs_dir}/${install_dir}/boot/licenses/${ucode_image%.*}/"
+            fi
+        fi
+    done
     _msg_info "Done!"
 }
 
@@ -450,13 +450,16 @@ _make_boot_bios.syslinux.mbr() {
     install -m 0644 -- "${airootfs_dir}/usr/lib/syslinux/bios/memdisk" "${isofs_dir}/${install_dir}/boot/syslinux/"
 
     _run_once _make_boot_on_iso
-    _uname_r=$(file -b "${isofs_dir}/${install_dir}/boot/${arch}/vmlinuz-linux" | awk 'f{print;f=0} /version/{f=1}' RS=' ')
 
-    install -d -m 0755 -- "${isofs_dir}/${install_dir}/boot/syslinux/hdt"
-    gzip -c -9 "${airootfs_dir}/usr/share/hwdata/pci.ids" > \
-        "${isofs_dir}/${install_dir}/boot/syslinux/hdt/pciids.gz"
-    gzip -c -9 "${airootfs_dir}/usr/lib/modules/${_uname_r}/modules.alias" > \
-        "${isofs_dir}/${install_dir}/boot/syslinux/hdt/modalias.gz"
+    if [[ -e "${isofs_dir}/${install_dir}/boot/syslinux/hdt.c32" ]]; then
+        install -d -m 0755 -- "${isofs_dir}/${install_dir}/boot/syslinux/hdt"
+        if [[ -e "${airootfs_dir}/usr/share/hwdata/pci.ids" ]]; then
+            gzip -c -9 "${airootfs_dir}/usr/share/hwdata/pci.ids" > \
+                "${isofs_dir}/${install_dir}/boot/syslinux/hdt/pciids.gz"
+        fi
+        find "${airootfs_dir}/usr/lib/modules" -name 'modules.alias' -print -exec gzip -c -9 '{}' ';' -quit > \
+            "${isofs_dir}/${install_dir}/boot/syslinux/hdt/modalias.gz"
+    fi
 
     # Add other aditional/extra files to ${install_dir}/boot/
     if [[ -e "${airootfs_dir}/boot/memtest86+/memtest.bin" ]]; then
@@ -473,10 +476,12 @@ _make_boot_bios.syslinux.mbr() {
 _make_boot_bios.syslinux.eltorito() {
     _msg_info "Setting up SYSLINUX for BIOS booting from an optical disc..."
     install -d -m 0755 -- "${isofs_dir}/isolinux"
-    sed "s|%ARCHISO_LABEL%|${iso_label}|g;
-         s|%INSTALL_DIR%|${install_dir}|g;
-         s|%ARCH%|${arch}|g" \
-         "${profile}/isolinux/isolinux.cfg" > "${isofs_dir}/isolinux/isolinux.cfg"
+    for _cfg in "${profile}/isolinux/"*".cfg"; do
+        sed "s|%ARCHISO_LABEL%|${iso_label}|g;
+             s|%INSTALL_DIR%|${install_dir}|g;
+             s|%ARCH%|${arch}|g" \
+             "${_cfg}" > "${isofs_dir}/isolinux/${_cfg##*/}"
+    done
     install -m 0644 -- "${airootfs_dir}/usr/lib/syslinux/bios/isolinux.bin" "${isofs_dir}/isolinux/"
     install -m 0644 -- "${airootfs_dir}/usr/lib/syslinux/bios/isohdpfx.bin" "${isofs_dir}/isolinux/"
     install -m 0644 -- "${airootfs_dir}/usr/lib/syslinux/bios/ldlinux.c32" "${isofs_dir}/isolinux/"
@@ -497,11 +502,12 @@ _make_efi() {
     install -d -m 0755 -- "${isofs_dir}/loader/entries"
     install -m 0644 -- "${profile}/efiboot/loader/loader.conf" "${isofs_dir}/loader/"
 
-    sed "s|%ARCHISO_LABEL%|${iso_label}|g;
-         s|%INSTALL_DIR%|${install_dir}|g;
-         s|%ARCH%|${arch}|g" \
-        "${profile}/efiboot/loader/entries/archiso-x86_64-linux.conf" > \
-        "${isofs_dir}/loader/entries/archiso-x86_64-linux.conf"
+    for _conf in "${profile}/efiboot/loader/entries/"*".conf"; do
+        sed "s|%ARCHISO_LABEL%|${iso_label}|g;
+             s|%INSTALL_DIR%|${install_dir}|g;
+             s|%ARCH%|${arch}|g" \
+            "${_conf}" > "${isofs_dir}/loader/entries/${_conf##*/}"
+    done
 
     # edk2-shell based UEFI shell
     # shellx64.efi is picked up automatically when on /
@@ -513,16 +519,21 @@ _make_efi() {
 
 # Prepare kernel/initramfs on efiboot.img
 _make_boot_on_fat() {
+    local ucode_image all_ucode_images=()
     _msg_info "Preparing kernel and intramfs for the FAT file system..."
     mmd -i "${isofs_dir}/EFI/archiso/efiboot.img" \
         "::/${install_dir}" "::/${install_dir}/boot" "::/${install_dir}/boot/${arch}"
-    mcopy -i "${isofs_dir}/EFI/archiso/efiboot.img" "${airootfs_dir}/boot/vmlinuz-linux" \
-        "${airootfs_dir}/boot/initramfs-linux.img" "::/${install_dir}/boot/${arch}/"
-    if [[ -e "${airootfs_dir}/boot/intel-ucode.img" ]]; then
-        mcopy -i "${isofs_dir}/EFI/archiso/efiboot.img" "${airootfs_dir}/boot/intel-ucode.img" "::/${install_dir}/boot/"
-    fi
-    if [[ -e "${airootfs_dir}/boot/amd-ucode.img" ]]; then
-        mcopy -i "${isofs_dir}/EFI/archiso/efiboot.img" "${airootfs_dir}/boot/amd-ucode.img" "::/${install_dir}/boot/"
+    mcopy -i "${isofs_dir}/EFI/archiso/efiboot.img" "${airootfs_dir}/boot/vmlinuz-"* \
+        "${airootfs_dir}/boot/initramfs-"*".img" "::/${install_dir}/boot/${arch}/"
+    for ucode_image in \
+        "${airootfs_dir}/boot/"{intel-uc.img,intel-ucode.img,amd-uc.img,amd-ucode.img,early_ucode.cpio,microcode.cpio}
+    do
+        if [[ -e "${ucode_image}" ]]; then
+            all_ucode_images+=("${ucode_image}")
+        fi
+    done
+    if (( ${#all_ucode_images[@]} )); then
+        mcopy -i "${isofs_dir}/EFI/archiso/efiboot.img" "${all_ucode_images[@]}" "::/${install_dir}/boot/"
     fi
     _msg_info "Done!"
 }
@@ -542,11 +553,12 @@ _make_boot_uefi-x64.systemd-boot.esp() {
 
     mmd -i "${isofs_dir}/EFI/archiso/efiboot.img" ::/loader ::/loader/entries
     mcopy -i "${isofs_dir}/EFI/archiso/efiboot.img" "${profile}/efiboot/loader/loader.conf" ::/loader/
-    sed "s|%ARCHISO_LABEL%|${iso_label}|g;
-         s|%INSTALL_DIR%|${install_dir}|g;
-         s|%ARCH%|${arch}|g" \
-        "${profile}/efiboot/loader/entries/archiso-x86_64-linux.conf" \
-        | mcopy -i "${isofs_dir}/EFI/archiso/efiboot.img" - ::/loader/entries/archiso-x86_64-linux.conf
+    for _conf in "${profile}/efiboot/loader/entries/"*".conf"; do
+        sed "s|%ARCHISO_LABEL%|${iso_label}|g;
+             s|%INSTALL_DIR%|${install_dir}|g;
+             s|%ARCH%|${arch}|g" \
+            "${_conf}" | mcopy -i "${isofs_dir}/EFI/archiso/efiboot.img" - "::/loader/entries/${_conf##*/}"
+    done
 
     # shellx64.efi is picked up automatically when on /
     if [[ -e "${airootfs_dir}/usr/share/edk2-shell/x64/Shell_Full.efi" ]]; then
-- 
cgit v1.2.3-70-g09d2


From f34c95797d72574f9c284e5ed1e88be1eb7a0c05 Mon Sep 17 00:00:00 2001
From: nl6720 <nl6720@gmail.com>
Date: Thu, 17 Sep 2020 14:17:27 +0300
Subject: Calculate required efiboot.img size instead of hardcoding it

Use du to count the file size of the kernel(s), initramfs images and boot loader (and its configuration).
This allows to compress initramfs with something other than xz, or have more than one kernel installed.

Fixes https://gitlab.archlinux.org/archlinux/archiso/-/issues/62 .
---
 archiso/mkarchiso | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

(limited to 'archiso/mkarchiso')

diff --git a/archiso/mkarchiso b/archiso/mkarchiso
index 3e33468..8adf232 100755
--- a/archiso/mkarchiso
+++ b/archiso/mkarchiso
@@ -540,12 +540,21 @@ _make_boot_on_fat() {
 
 # Prepare efiboot.img::/EFI for EFI boot mode
 _make_boot_uefi-x64.systemd-boot.esp() {
+    local efiboot_imgsize="0"
     _msg_info "Setting up systemd-boot for UEFI booting..."
     install -d -m 0755 -- "${isofs_dir}/EFI/archiso"
 
+    efiboot_imgsize="$(( (( (( $(du --apparent-size -bc \
+        "${airootfs_dir}/usr/lib/systemd/boot/efi/systemd-bootx64.efi" \
+        "${airootfs_dir}/usr/share/edk2-shell/x64/Shell_Full.efi" \
+        "${profile}/efiboot/" \
+        "${airootfs_dir}/boot/vmlinuz-"* \
+        "${airootfs_dir}/boot/initramfs-"*".img" \
+        "${airootfs_dir}/boot/"{intel-uc.img,intel-ucode.img,amd-uc.img,amd-ucode.img,early_ucode.cpio,microcode.cpio} \
+        2>/dev/null | awk 'END {print $1}') / 1048576 )) +1 )) * 1024 ))"
     # The FAT image must be created with mkfs.fat not mformat, as some systems have issues with mformat made images:
     # https://lists.gnu.org/archive/html/grub-devel/2019-04/msg00099.html
-    mkfs.fat -C -n ARCHISO_EFI "${isofs_dir}/EFI/archiso/efiboot.img" 65536
+    mkfs.fat -C -n ARCHISO_EFI "${isofs_dir}/EFI/archiso/efiboot.img" "$efiboot_imgsize"
 
     mmd -i "${isofs_dir}/EFI/archiso/efiboot.img" ::/EFI ::/EFI/BOOT
     mcopy -i "${isofs_dir}/EFI/archiso/efiboot.img" \
-- 
cgit v1.2.3-70-g09d2


From 2e1ddec0a796188097bae05117973c60da81ab51 Mon Sep 17 00:00:00 2001
From: David Runge <dvzrv@archlinux.org>
Date: Tue, 29 Sep 2020 13:14:11 +0200
Subject: Fix info message for legacy command

archiso/mkarchiso:
Change the way _show_config() displays information about the build environment, as displaying a profile directory as a
legacy command to mkarchiso is confusing.
The function now prints a deprecation message if '$command_name' is not a directory (i.e. not a profile).
Remove 'command_' prefix from help output for legacy commands (the prefix is only in use for internal functions).

Relates to !69
Fixes #60
---
 archiso/mkarchiso | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

(limited to 'archiso/mkarchiso')

diff --git a/archiso/mkarchiso b/archiso/mkarchiso
index 8adf232..01eb536 100755
--- a/archiso/mkarchiso
+++ b/archiso/mkarchiso
@@ -115,7 +115,7 @@ usage ${app_name} [options] <profile_dir or legacy_command>
      -o <out_dir>     Set the output directory
                       Default: '${out_dir}'
      -p PACKAGE(S)    Package(s) to install, can be used multiple times
-     -r <run_cmd>     Set a command to be run in chroot (only relevant for for command_run)
+     -r <run_cmd>     Set a command to be run in chroot (only relevant for legacy 'run' command)
                       NOTE: Deprecated, will be removed with archiso v49
      -s <sfs_mode>    Set SquashFS image mode (img or sfs)
                       img: prepare airootfs.sfs for dm-snapshot usage
@@ -129,17 +129,17 @@ usage ${app_name} [options] <profile_dir or legacy_command>
 
   legacy_command:     Legacy build.sh command
                       NOTE: Deprecated, will be removed with archiso v49
-    command_init
+    init
         initialize a chroot for building
-    command_install
+    install
         install packages to the chroot
-    command_run
+    run
         run a command in the chroot
-    command_prepare
+    prepare
         cleanup and prepare the airootfs
-    command_pkglist
+    pkglist
         create a list of packages installed on the medium
-    command_iso
+    iso
         create the ISO
 ENDUSAGETEXT
     printf '%s' "${usagetext}"
@@ -151,7 +151,7 @@ ENDUSAGETEXT
 _show_config() {
     local _mode="$1"
     _msg_info "${app_name} configuration settings"
-    _msg_info "                  Command:   ${command_name}"
+    [[ ! -d "${command_name}" ]] && _msg_info "           Legacy Command:   ${command_name}"
     _msg_info "             Architecture:   ${arch}"
     _msg_info "        Working directory:   ${work_dir}"
     _msg_info "   Installation directory:   ${install_dir}"
-- 
cgit v1.2.3-70-g09d2


From 55cfb8ba021266d754eb21fb22c666f9f7a49442 Mon Sep 17 00:00:00 2001
From: David Runge <dvzrv@archlinux.org>
Date: Sat, 3 Oct 2020 19:58:41 +0200
Subject: Replace bash arithmetic with awk functions

archiso/mkarchiso:
The bash arithmethics in _make_boot_uefi-x64.systemd-boot.esp() introduced rounding issues, that can lead to
insufficient FAT image size for the files.
Conversion functions for awk now replace the bash arithmetics and additionally a ceil() function rounds the calculated
size up to the next full MiB.
Add an info message about the size of the created FAT image.

Fixes #70
---
 archiso/mkarchiso | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

(limited to 'archiso/mkarchiso')

diff --git a/archiso/mkarchiso b/archiso/mkarchiso
index 01eb536..ed932d9 100755
--- a/archiso/mkarchiso
+++ b/archiso/mkarchiso
@@ -544,16 +544,22 @@ _make_boot_uefi-x64.systemd-boot.esp() {
     _msg_info "Setting up systemd-boot for UEFI booting..."
     install -d -m 0755 -- "${isofs_dir}/EFI/archiso"
 
-    efiboot_imgsize="$(( (( (( $(du --apparent-size -bc \
+    # the required image size in KiB (rounded up to the next full MiB with an additional MiB for reserved sectors)
+    efiboot_imgsize="$(du -bc \
         "${airootfs_dir}/usr/lib/systemd/boot/efi/systemd-bootx64.efi" \
         "${airootfs_dir}/usr/share/edk2-shell/x64/Shell_Full.efi" \
         "${profile}/efiboot/" \
         "${airootfs_dir}/boot/vmlinuz-"* \
         "${airootfs_dir}/boot/initramfs-"*".img" \
         "${airootfs_dir}/boot/"{intel-uc.img,intel-ucode.img,amd-uc.img,amd-ucode.img,early_ucode.cpio,microcode.cpio} \
-        2>/dev/null | awk 'END {print $1}') / 1048576 )) +1 )) * 1024 ))"
+        2>/dev/null | awk 'function ceil(x){return int(x)+(x>int(x))}
+            function byte_to_kib(x){return x/1024}
+            function mib_to_kib(x){return x*1024}
+            END {print mib_to_kib(ceil((byte_to_kib($1)+1024)/1024))}'
+        )"
     # The FAT image must be created with mkfs.fat not mformat, as some systems have issues with mformat made images:
     # https://lists.gnu.org/archive/html/grub-devel/2019-04/msg00099.html
+    _msg_info "Creating FAT image of size: ${efiboot_imgsize} KiB..."
     mkfs.fat -C -n ARCHISO_EFI "${isofs_dir}/EFI/archiso/efiboot.img" "$efiboot_imgsize"
 
     mmd -i "${isofs_dir}/EFI/archiso/efiboot.img" ::/EFI ::/EFI/BOOT
-- 
cgit v1.2.3-70-g09d2


From b6241cb1d07fe38128a67ae73e1ee57085085eaf Mon Sep 17 00:00:00 2001
From: nl6720 <nl6720@gmail.com>
Date: Thu, 1 Oct 2020 17:02:11 +0300
Subject: Don't require root privileges just to show a "No command specified"
 error

Check if a profile or command is specified before looking at EUID.
---
 archiso/mkarchiso | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to 'archiso/mkarchiso')

diff --git a/archiso/mkarchiso b/archiso/mkarchiso
index ed932d9..9e96f5e 100755
--- a/archiso/mkarchiso
+++ b/archiso/mkarchiso
@@ -827,16 +827,16 @@ while getopts 'p:r:C:L:P:A:D:w:o:s:c:g:vh?' arg; do
     esac
 done
 
+if (( OPTIND <= 1 )); then
+    _msg_error "No command specified" 0
+    _usage 1
+fi
+
 if (( EUID != 0 )); then
     _msg_error "${app_name} must be run as root." 1
 fi
 
 shift $((OPTIND - 1))
-
-if (( $# < 1 )); then
-    _msg_error "No command specified" 0
-    _usage 1
-fi
 command_name="${1}"
 
 # Set directory path defaults for legacy commands
-- 
cgit v1.2.3-70-g09d2


From 455e2b94c00f748707f3dac6f0bb9a8c67dee4fe Mon Sep 17 00:00:00 2001
From: nl6720 <nl6720@gmail.com>
Date: Wed, 7 Oct 2020 11:29:03 +0300
Subject: Check command line parameter count instead of option count, and do it
 after evaluating option arguments

Fixes b6241cb1d07fe38128a67ae73e1ee57085085eaf .
---
 archiso/mkarchiso | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'archiso/mkarchiso')

diff --git a/archiso/mkarchiso b/archiso/mkarchiso
index 9e96f5e..2e31e65 100755
--- a/archiso/mkarchiso
+++ b/archiso/mkarchiso
@@ -827,7 +827,9 @@ while getopts 'p:r:C:L:P:A:D:w:o:s:c:g:vh?' arg; do
     esac
 done
 
-if (( OPTIND <= 1 )); then
+shift $((OPTIND - 1))
+
+if (( $# < 1 )); then
     _msg_error "No command specified" 0
     _usage 1
 fi
@@ -836,7 +838,6 @@ if (( EUID != 0 )); then
     _msg_error "${app_name} must be run as root." 1
 fi
 
-shift $((OPTIND - 1))
 command_name="${1}"
 
 # Set directory path defaults for legacy commands
-- 
cgit v1.2.3-70-g09d2


From f45fc29fe09a98c46e85da56f1709be438d4c33f Mon Sep 17 00:00:00 2001
From: nl6720 <nl6720@gmail.com>
Date: Mon, 28 Sep 2020 20:12:01 +0300
Subject: Save SOURCE_DATE_EPOCH to a file and read it from the file when
 resuming a build

Print the build date.
Don't re-run mksquashfs if it succeeded, but the failure was in gpg signing. For example, if the gpg pinentry timed out.
---
 archiso/mkarchiso | 18 ++++++++++++------
 1 file changed, 12 insertions(+), 6 deletions(-)

(limited to 'archiso/mkarchiso')

diff --git a/archiso/mkarchiso b/archiso/mkarchiso
index 2e31e65..6153c4e 100755
--- a/archiso/mkarchiso
+++ b/archiso/mkarchiso
@@ -149,7 +149,8 @@ ENDUSAGETEXT
 # Shows configuration according to command mode.
 # $1: build_profile | init | install | run | prepare | iso
 _show_config() {
-    local _mode="$1"
+    local _mode="$1" build_date
+    build_date="$(date --utc --iso-8601=seconds -d "@${SOURCE_DATE_EPOCH}")"
     _msg_info "${app_name} configuration settings"
     [[ ! -d "${command_name}" ]] && _msg_info "           Legacy Command:   ${command_name}"
     _msg_info "             Architecture:   ${arch}"
@@ -157,6 +158,7 @@ _show_config() {
     _msg_info "   Installation directory:   ${install_dir}"
     case "${_mode}" in
         build_profile)
+            _msg_info "               Build date:   ${build_date}"
             _msg_info "         Output directory:   ${out_dir}"
             _msg_info "                  GPG key:   ${gpg_key:-None}"
             _msg_info "                  Profile:   ${profile}"
@@ -597,9 +599,9 @@ _make_boot_uefi-x64.systemd-boot.eltorito() {
 # Build airootfs filesystem image
 _make_prepare() {
     if [[ "${sfs_mode}" == "sfs" ]]; then
-        _mkairootfs_sfs
+        _run_once _mkairootfs_sfs
     else
-        _mkairootfs_img
+        _run_once _mkairootfs_img
     fi
     _mkchecksum
     if [[ "${gpg_key}" ]]; then
@@ -783,12 +785,16 @@ command_build_profile() {
     isofs_dir="${work_dir}/iso"
     # Set ISO file name
     img_name="${iso_name}-${iso_version}-${arch}.iso"
-
-    _show_config "${FUNCNAME[0]#command_}"
-
     # Create working directory
     [[ -d "${work_dir}" ]] || install -d -- "${work_dir}"
+    # Write build date to file or if the file exists, read it from there
+    if [[ -e "${work_dir}/build_date" ]]; then
+        SOURCE_DATE_EPOCH="$(<"${work_dir}/build_date")"
+    else
+        printf '%s\n' "$SOURCE_DATE_EPOCH" > "${work_dir}/build_date"
+    fi
 
+    _show_config "${FUNCNAME[0]#command_}"
     _run_once _make_pacman_conf
     _run_once _export_gpg_publickey
     _run_once _make_custom_airootfs
-- 
cgit v1.2.3-70-g09d2


From bfab360529cb9d5e56712f86caad5003f94bc83f Mon Sep 17 00:00:00 2001
From: nl6720 <nl6720@gmail.com>
Date: Sun, 4 Oct 2020 11:28:53 +0300
Subject: Ensure that _make_boot_uefi-x64.systemd-boot.esp can be re-run if it
 fails

Remove efiboot.img if it exists so that mkfs.fat does not fail.
---
 archiso/mkarchiso | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'archiso/mkarchiso')

diff --git a/archiso/mkarchiso b/archiso/mkarchiso
index 6153c4e..b7d8038 100755
--- a/archiso/mkarchiso
+++ b/archiso/mkarchiso
@@ -561,6 +561,7 @@ _make_boot_uefi-x64.systemd-boot.esp() {
         )"
     # The FAT image must be created with mkfs.fat not mformat, as some systems have issues with mformat made images:
     # https://lists.gnu.org/archive/html/grub-devel/2019-04/msg00099.html
+    [[ -e "${isofs_dir}/EFI/archiso/efiboot.img" ]] && rm -f -- "${isofs_dir}/EFI/archiso/efiboot.img"
     _msg_info "Creating FAT image of size: ${efiboot_imgsize} KiB..."
     mkfs.fat -C -n ARCHISO_EFI "${isofs_dir}/EFI/archiso/efiboot.img" "$efiboot_imgsize"
 
@@ -584,7 +585,7 @@ _make_boot_uefi-x64.systemd-boot.esp() {
     fi
 
     # Copy kernel and initramfs
-    _run_once _make_boot_on_fat
+    _make_boot_on_fat
 
     _msg_info "Done! systemd-boot set up for UEFI booting successfully."
 }
-- 
cgit v1.2.3-70-g09d2


From 729d16b48c99c5d9b23a89123ecde4ecacfa8705 Mon Sep 17 00:00:00 2001
From: nl6720 <nl6720@gmail.com>
Date: Sun, 4 Oct 2020 16:13:22 +0300
Subject: Move FAT image to a separate partition outside the ISO 9660 file
 system

Support bios.syslinux.eltorito boot mode without bios.syslinux.mbr.
bios.syslinux.mbr does not work without bios.syslinux.eltorito because -isohybrid-mbr requires the El Torito boot image.

Support uefi-x64.systemd-boot.esp boot mode without uefi-x64.systemd-boot.eltorito and vice versa.
If uefi-x64.systemd-boot.eltorito is used without uefi-x64.systemd-boot.esp, the El Torito boot image will be placed in the ISO 9660 file system as before.
Note that an ISO created with only uefi-x64.systemd-boot.eltorito will still be bootable as a "hard disk" on OVMF. OVMF will boot the El Torito image.

This change has the following effect on the partition tables:

- *.eltorito options add El Torito boot catalog entries. MBR and GPT are not affected.
- uefi-x64.systemd-boot.esp creates a protective MBR partition table and a GPT table that includes a Linux filesystem data partition for the ISO 9660 volume, an EFI system partition and a Microsoft basic data partition that maps the 300 KiB padding added by xorriso.
- bios.syslinux.mbr (without uefi-x64.systemd-boot.esp): adds a MBR partition table and maps the ISO 9660 volume as a partition of type 0x83. No GPT is produced.
- bios.syslinux.mbr (with uefi-x64.systemd-boot.esp): adds an second partition in the MBR (after 0xEE) starting from sector 0 to sector 1 with type 0 and marks it as bootable. This violates the GPT specification, but allows some systems to succesfully boot in BIOS mode from GPT.

Fixes https://gitlab.archlinux.org/archlinux/archiso/-/issues/49
---
 archiso/mkarchiso | 136 ++++++++++++++++++++++++++++++++++++++++++------------
 1 file changed, 106 insertions(+), 30 deletions(-)

(limited to 'archiso/mkarchiso')

diff --git a/archiso/mkarchiso b/archiso/mkarchiso
index b7d8038..b5c5150 100755
--- a/archiso/mkarchiso
+++ b/archiso/mkarchiso
@@ -523,9 +523,9 @@ _make_efi() {
 _make_boot_on_fat() {
     local ucode_image all_ucode_images=()
     _msg_info "Preparing kernel and intramfs for the FAT file system..."
-    mmd -i "${isofs_dir}/EFI/archiso/efiboot.img" \
+    mmd -i "${work_dir}/efiboot.img" \
         "::/${install_dir}" "::/${install_dir}/boot" "::/${install_dir}/boot/${arch}"
-    mcopy -i "${isofs_dir}/EFI/archiso/efiboot.img" "${airootfs_dir}/boot/vmlinuz-"* \
+    mcopy -i "${work_dir}/efiboot.img" "${airootfs_dir}/boot/vmlinuz-"* \
         "${airootfs_dir}/boot/initramfs-"*".img" "::/${install_dir}/boot/${arch}/"
     for ucode_image in \
         "${airootfs_dir}/boot/"{intel-uc.img,intel-ucode.img,amd-uc.img,amd-ucode.img,early_ucode.cpio,microcode.cpio}
@@ -535,7 +535,7 @@ _make_boot_on_fat() {
         fi
     done
     if (( ${#all_ucode_images[@]} )); then
-        mcopy -i "${isofs_dir}/EFI/archiso/efiboot.img" "${all_ucode_images[@]}" "::/${install_dir}/boot/"
+        mcopy -i "${work_dir}/efiboot.img" "${all_ucode_images[@]}" "::/${install_dir}/boot/"
     fi
     _msg_info "Done!"
 }
@@ -544,7 +544,6 @@ _make_boot_on_fat() {
 _make_boot_uefi-x64.systemd-boot.esp() {
     local efiboot_imgsize="0"
     _msg_info "Setting up systemd-boot for UEFI booting..."
-    install -d -m 0755 -- "${isofs_dir}/EFI/archiso"
 
     # the required image size in KiB (rounded up to the next full MiB with an additional MiB for reserved sectors)
     efiboot_imgsize="$(du -bc \
@@ -561,26 +560,26 @@ _make_boot_uefi-x64.systemd-boot.esp() {
         )"
     # The FAT image must be created with mkfs.fat not mformat, as some systems have issues with mformat made images:
     # https://lists.gnu.org/archive/html/grub-devel/2019-04/msg00099.html
-    [[ -e "${isofs_dir}/EFI/archiso/efiboot.img" ]] && rm -f -- "${isofs_dir}/EFI/archiso/efiboot.img"
+    [[ -e "${work_dir}/efiboot.img" ]] && rm -f -- "${work_dir}/efiboot.img"
     _msg_info "Creating FAT image of size: ${efiboot_imgsize} KiB..."
-    mkfs.fat -C -n ARCHISO_EFI "${isofs_dir}/EFI/archiso/efiboot.img" "$efiboot_imgsize"
+    mkfs.fat -C -n ARCHISO_EFI "${work_dir}/efiboot.img" "$efiboot_imgsize"
 
-    mmd -i "${isofs_dir}/EFI/archiso/efiboot.img" ::/EFI ::/EFI/BOOT
-    mcopy -i "${isofs_dir}/EFI/archiso/efiboot.img" \
+    mmd -i "${work_dir}/efiboot.img" ::/EFI ::/EFI/BOOT
+    mcopy -i "${work_dir}/efiboot.img" \
         "${airootfs_dir}/usr/lib/systemd/boot/efi/systemd-bootx64.efi" ::/EFI/BOOT/BOOTx64.EFI
 
-    mmd -i "${isofs_dir}/EFI/archiso/efiboot.img" ::/loader ::/loader/entries
-    mcopy -i "${isofs_dir}/EFI/archiso/efiboot.img" "${profile}/efiboot/loader/loader.conf" ::/loader/
+    mmd -i "${work_dir}/efiboot.img" ::/loader ::/loader/entries
+    mcopy -i "${work_dir}/efiboot.img" "${profile}/efiboot/loader/loader.conf" ::/loader/
     for _conf in "${profile}/efiboot/loader/entries/"*".conf"; do
         sed "s|%ARCHISO_LABEL%|${iso_label}|g;
              s|%INSTALL_DIR%|${install_dir}|g;
              s|%ARCH%|${arch}|g" \
-            "${_conf}" | mcopy -i "${isofs_dir}/EFI/archiso/efiboot.img" - "::/loader/entries/${_conf##*/}"
+            "${_conf}" | mcopy -i "${work_dir}/efiboot.img" - "::/loader/entries/${_conf##*/}"
     done
 
     # shellx64.efi is picked up automatically when on /
     if [[ -e "${airootfs_dir}/usr/share/edk2-shell/x64/Shell_Full.efi" ]]; then
-        mcopy -i "${isofs_dir}/EFI/archiso/efiboot.img" \
+        mcopy -i "${work_dir}/efiboot.img" \
             "${airootfs_dir}/usr/share/edk2-shell/x64/Shell_Full.efi" ::/shellx64.efi
     fi
 
@@ -619,29 +618,106 @@ _make_iso() {
     if [[ "${quiet}" == "y" ]]; then
         xorrisofs_options+=('-quiet')
     fi
+
+    # xorrisofs options for x86 BIOS booting using SYSLINUX
     # shellcheck disable=SC2076
     if [[ " ${bootmodes[*]} " =~ ' bios.syslinux.' ]]; then
-        if [[ ! -f "${isofs_dir}/isolinux/isolinux.bin" ]]; then
-            _msg_error "The file '${isofs_dir}/isolinux/isolinux.bin' does not exist." 1
-        fi
-        if [[ ! -f "${isofs_dir}/isolinux/isohdpfx.bin" ]]; then
-            _msg_error "The file '${isofs_dir}/isolinux/isohdpfx.bin' does not exist." 1
+
+        # SYSLINUX El Torito
+        if [[ " ${bootmodes[*]} " =~ ' bios.syslinux.eltorito ' ]]; then
+            if [[ ! -f "${isofs_dir}/isolinux/isolinux.bin" ]]; then
+                _msg_error "The file '${isofs_dir}/isolinux/isolinux.bin' does not exist." 1
+            fi
+
+            # SYSLINUX MBR
+            if [[ " ${bootmodes[*]} " =~ ' bios.syslinux.mbr ' ]]; then
+                if [[ ! -f "${isofs_dir}/isolinux/isohdpfx.bin" ]]; then
+                    _msg_error "The file '${isofs_dir}/isolinux/isohdpfx.bin' does not exist." 1
+                fi
+
+                xorrisofs_options+=(
+                    # SYSLINUX MBR bootstrap code; does not work without "-eltorito-boot isolinux/isolinux.bin"
+                    '-isohybrid-mbr' "${isofs_dir}/isolinux/isohdpfx.bin"
+                    # When GPT is used, create an additional partition in the MBR (besides 0xEE) for sectors 0–1 (MBR
+                    # bootstrap code area) and mark it as bootable
+                    # This violates the UEFI specification, but may allow booting on some systems
+                    # https://wiki.archlinux.org/index.php/Partitioning#Tricking_old_BIOS_into_booting_from_GPT
+                    '--mbr-force-bootable'
+                    # Set the ISO 9660 partition's type to "Linux filesystem data"
+                    # When only MBR is present, the partition type ID will be 0x83 "Linux" as xorriso translates all
+                    # GPT partition type GUIDs except for the ESP GUID to MBR type ID 0x83
+                    '-iso_mbr_part_type' '0FC63DAF-8483-4772-8E79-3D69D8477DE4'
+                    # Move the first partition away from the start of the ISO to match the expectations of partition
+                    # editors
+                    # May allow booting on some systems
+                    # https://dev.lovelyhq.com/libburnia/libisoburn/src/branch/master/doc/partition_offset.wiki
+                    '-partition_offset' '16'
+                )
+            fi
+
+            xorrisofs_options+=(
+                # El Torito boot image for x86 BIOS
+                '-eltorito-boot' 'isolinux/isolinux.bin'
+                # El Torito boot catalog file
+                '-eltorito-catalog' 'isolinux/boot.cat'
+                # Required options to boot with ISOLINUX
+                '-no-emul-boot' '-boot-load-size' '4' '-boot-info-table'
+            )
+        else
+            _msg_error "Using 'bios.syslinux.mbr' boot mode without 'bios.syslinux.eltorito' is not supported." 1
         fi
-        xorrisofs_options+=(
-            '-eltorito-boot' 'isolinux/isolinux.bin'
-            '-eltorito-catalog' 'isolinux/boot.cat'
-            '-no-emul-boot' '-boot-load-size' '4' '-boot-info-table'
-            '-isohybrid-mbr' "${isofs_dir}/isolinux/isohdpfx.bin"
-        )
     fi
+
+    # xorrisofs options for X64 UEFI booting using systemd-boot
     # shellcheck disable=SC2076
     if [[ " ${bootmodes[*]} " =~ ' uefi-x64.systemd-boot.' ]]; then
-        xorrisofs_options+=(
-            '-eltorito-alt-boot'
-            '-e' 'EFI/archiso/efiboot.img'
-            '-no-emul-boot'
-            '-isohybrid-gpt-basdat'
-        )
+        if [[ ! -f "${work_dir}/efiboot.img" ]]; then
+            _msg_error "The file '${work_dir}/efiboot.img' does not exist." 1
+        fi
+        [[ -e "${isofs_dir}/EFI/archiso" ]] && rm -rf -- "${isofs_dir}/EFI/archiso"
+
+        # systemd-boot in an attached EFI system partition
+        if [[ " ${bootmodes[*]} " =~ ' uefi-x64.systemd-boot.esp ' ]]; then
+            # Move the first partition away from the start of the ISO, otherwise the GPT will not be valid and ISO 9660
+            # partition will not be mountable
+            [[ " ${xorrisofs_options[*]} " =~ ' -partition_offset ' ]] || xorrisofs_options+=('-partition_offset' '16')
+            xorrisofs_options+=(
+                # Attach efiboot.img as a second partition and set its partition type to "EFI system partition"
+                '-append_partition' '2' 'C12A7328-F81F-11D2-BA4B-00A0C93EC93B' "${work_dir}/efiboot.img"
+                # Ensure GPT is used as some systems do not support UEFI booting without it
+                '-appended_part_as_gpt'
+            )
+
+            # systemd-boot in an attached EFI system partition via El Torito
+            if [[ " ${bootmodes[*]} " =~ ' uefi-x64.systemd-boot.eltorito ' ]]; then
+                xorrisofs_options+=(
+                    # Start a new El Torito boot entry for UEFI
+                    '-eltorito-alt-boot'
+                    # Set the second partition as the El Torito UEFI boot image
+                    '-e' '--interval:appended_partition_2:all::'
+                    # Boot image is not emulating floppy or hard disk; required for all known boot loaders
+                    '-no-emul-boot'
+                )
+            fi
+        # systemd-boot in an embedded efiboot.img via El Torito
+        elif [[ " ${bootmodes[*]} " =~ ' uefi-x64.systemd-boot.eltorito ' ]]; then
+            # The ISO will not contain a GPT partition table, so to be able to reference efiboot.img, place it as a
+            # file inside the ISO 9660 file system
+            install -d -m 0755 -- "${isofs_dir}/EFI/archiso"
+            cp -a -- "${work_dir}/efiboot.img" "${isofs_dir}/EFI/archiso/efiboot.img"
+
+            xorrisofs_options+=(
+                # Start a new El Torito boot entry for UEFI
+                '-eltorito-alt-boot'
+                # Set efiboot.img as the El Torito UEFI boot image
+                '-e' 'EFI/archiso/efiboot.img'
+                # Boot image is not emulating floppy or hard disk; required for all known boot loaders
+                '-no-emul-boot'
+            )
+        fi
+
+        # Specify where to save the El Torito boot catalog file in case it is not already set by bios.syslinux.eltorito
+        [[ " ${bootmodes[*]} " =~ ' bios.' ]] || xorrisofs_options+=('-eltorito-catalog' 'EFI/boot.cat')
     fi
 
     _msg_info "Creating ISO image..."
@@ -737,7 +813,7 @@ command_iso() {
     bootmodes=('bios.syslinux.mbr' 'bios.syslinux.eltorito')
 
     # If exists, add an EFI "El Torito" boot image (FAT filesystem) to ISO-9660 image.
-    if [[ -f "${isofs_dir}/EFI/archiso/efiboot.img" ]]; then
+    if [[ -f "${work_dir}/efiboot.img" ]]; then
         bootmodes+=('uefi-x64.systemd-boot.esp' 'uefi-x64.systemd-boot.eltorito')
     fi
 
-- 
cgit v1.2.3-70-g09d2


From f3af5692059067cf8692b5cd1e0d7395c41fec06 Mon Sep 17 00:00:00 2001
From: David Runge <dvzrv@archlinux.org>
Date: Fri, 23 Oct 2020 22:13:52 +0200
Subject: Set CacheDir and HookDir for profile more sanely

archiso/mkarchiso:
Change `_pacman()` to use the *modified* pacman.conf from the work_dir, instead of using the *unmodified* pacman.conf from
the profile.

Change `_make_pacman_conf()` to compare the system's and the profile's CacheDir setting and use the profile's CacheDir
setting only if it's not the default and not the same as the system's.

Always set the HookDir to the airootfs' override directory, so that no hooks from the host system are being run.

Remove DBPath, LogFile and RootDir settings from the work_dir pacman.conf as they are otherwise referring to the host
system, **even if** pacman is being called with the `-r` flag.

Fix a typo in _make_custom_airootfs().

README.profile.rst:
Add information about the pacman.conf in a profile and how configuration options behave, when used by mkarchiso.

Fixes #73
Fixes #74
---
 README.profile.rst | 24 ++++++++++++++++++++++++
 archiso/mkarchiso  | 36 ++++++++++++++++++++++++++++--------
 2 files changed, 52 insertions(+), 8 deletions(-)
 create mode 100644 README.profile.rst

(limited to 'archiso/mkarchiso')

diff --git a/README.profile.rst b/README.profile.rst
new file mode 100644
index 0000000..7e8e177
--- /dev/null
+++ b/README.profile.rst
@@ -0,0 +1,24 @@
+=======
+profile
+=======
+
+An archiso profile consists of several configuration files and a directory for files to be added to the resulting image.
+
+pacman.conf
+===========
+
+A configuration for pacman is required per profile.
+
+Some configuration options will not be used or will be modified:
+
+* `CacheDir`: the profile's option is **only** used if it is not the default (i.e. `/var/cache/pacman/pkg`) and if it is
+  not the same as the system's option. In all other cases the system's pacman cache is used.
+* `HookDir`: it is **always** set to the `/etc/pacman.d/hooks` airootfs directory in the work directories airootfs to
+  allow modification via the profile and ensure interoparability with hosts using dracut (see #73 for further
+  information)
+* `RootDir`: it is **always** removed, as setting it explicitely otherwise refers to the host's root filesystem (see
+  `man 8 pacman` for further information on the `-r` option used by `pacstrap`)
+* `LogFile`: it is **always** removed, as setting it explicitely otherwise refers to the host's pacman log file (see
+  `man 8 pacman` for further information on the `-r` option used by `pacstrap`)
+* `DBPath`: it is **always** removed, as setting it explicitely otherwise refers to the host's pacman database (see
+  `man 8 pacman` for further information on the `-r` option used by `pacstrap`)
diff --git a/archiso/mkarchiso b/archiso/mkarchiso
index b5c5150..9eca18b 100755
--- a/archiso/mkarchiso
+++ b/archiso/mkarchiso
@@ -202,9 +202,9 @@ _pacman() {
     _msg_info "Installing packages to '${airootfs_dir}/'..."
 
     if [[ "${quiet}" = "y" ]]; then
-        pacstrap -C "${pacman_conf}" -c -G -M -- "${airootfs_dir}" "$@" &> /dev/null
+        pacstrap -C "${work_dir}/pacman.conf" -c -G -M -- "${airootfs_dir}" "$@" &> /dev/null
     else
-        pacstrap -C "${pacman_conf}" -c -G -M -- "${airootfs_dir}" "$@"
+        pacstrap -C "${work_dir}/pacman.conf" -c -G -M -- "${airootfs_dir}" "$@"
     fi
 
     _msg_info "Done! Packages installed successfully."
@@ -321,12 +321,32 @@ _run_once() {
     fi
 }
 
-# Set up custom pacman.conf with current cache directories.
+# Set up custom pacman.conf with custom cache and pacman hook directories
 _make_pacman_conf() {
-    local _cache_dirs
-    _cache_dirs="$(pacman-conf CacheDir)"
-    sed -r "s|^#?\\s*CacheDir.+|CacheDir    = ${_cache_dirs[*]//$'\n'/ }|g" \
-        "${pacman_conf}" > "${work_dir}/pacman.conf"
+    local _cache_dirs _system_cache_dirs _profile_cache_dirs
+    _system_cache_dirs="$(pacman-conf CacheDir| tr '\n' ' ')"
+    _profile_cache_dirs="$(pacman-conf --config "${pacman_conf}" CacheDir| tr '\n' ' ')"
+
+    # only use the profile's CacheDir, if it is not the default and not the same as the system cache dir
+    if [[ "${_profile_cache_dirs}" != "/var/cache/pacman/pkg" ]] && \
+        [[ "${_system_cache_dirs}" != "${_profile_cache_dirs}" ]]; then
+        _cache_dirs="${_profile_cache_dirs}"
+    else
+        _cache_dirs="${_system_cache_dirs}"
+    fi
+
+    _msg_info "Copying custom pacman.conf to work directory..."
+    # take the profile pacman.conf and strip all settings that would break in chroot when using pacman -r
+    # see `man 8 pacman` for further info
+    pacman-conf --config "${pacman_conf}" | \
+        sed '/CacheDir/d;/DBPath/d;/HookDir/d;/LogFile/d;/RootDir/d' > "${work_dir}/pacman.conf"
+
+    _msg_info "Using pacman CacheDir: ${_cache_dirs}"
+    # append CacheDir and HookDir to [options] section
+    # HookDir is *always* set to the airootfs' override directory
+    sed "/\[options\]/a CacheDir = ${_cache_dirs}
+        /\[options\]/a HookDir = ${airootfs_dir}/etc/pacman.d/hooks/" \
+        -i "${work_dir}/pacman.conf"
 }
 
 # Prepare working directory and copy custom airootfs files (airootfs)
@@ -336,7 +356,7 @@ _make_custom_airootfs() {
     install -d -m 0755 -o 0 -g 0 -- "${airootfs_dir}"
 
     if [[ -d "${profile}/airootfs" ]]; then
-        _msg_info "Copying custom custom airootfs files and setting up user home directories..."
+        _msg_info "Copying custom airootfs files and setting up user home directories..."
         cp -af --no-preserve=ownership -- "${profile}/airootfs/." "${airootfs_dir}"
 
         [[ -e "${airootfs_dir}/etc/shadow" ]] && chmod -f 0400 -- "${airootfs_dir}/etc/shadow"
-- 
cgit v1.2.3-70-g09d2


From 1bd944ee7cc287359d9b7e504b5f02d324f5a2ea Mon Sep 17 00:00:00 2001
From: David Runge <dvzrv@archlinux.org>
Date: Sat, 24 Oct 2020 22:59:52 +0200
Subject: Remove build.sh support from profiles and mkarchiso

configs/{baseline,releng}/build.sh:
Remove `build.sh` scripts. They were deprecated with v47.

archiso/mkarchiso:
Remove all `build.sh` related functionality (i.e. `command_pkglist()`, `command_iso()`, `command_prepare()`,
`command_install()`, `command_init()`, `command_run()`).

Rename `command_build_profile()` to `_build_profile()` to be more in line with the style of the other function naming.

Change `_show_config()` to only print info about the profile and make no more use of parameters.

Remove all help output related to legacy `build.sh` commands.

Fixes #51
---
 archiso/mkarchiso         | 181 ++++++----------------------------------------
 configs/baseline/build.sh |   7 --
 configs/releng/build.sh   |   7 --
 3 files changed, 21 insertions(+), 174 deletions(-)
 delete mode 100755 configs/baseline/build.sh
 delete mode 100755 configs/releng/build.sh

(limited to 'archiso/mkarchiso')

diff --git a/archiso/mkarchiso b/archiso/mkarchiso
index 9eca18b..5bb042c 100755
--- a/archiso/mkarchiso
+++ b/archiso/mkarchiso
@@ -95,7 +95,7 @@ _umount_airootfs() {
 # $1: exit status number.
 _usage() {
     IFS='' read -r -d '' usagetext <<ENDUSAGETEXT || true
-usage ${app_name} [options] <profile_dir or legacy_command>
+usage: ${app_name} [options] <profile_dir>
   options:
      -A <application> Set an application name for the ISO
                       Default: '${iso_application}'
@@ -115,8 +115,6 @@ usage ${app_name} [options] <profile_dir or legacy_command>
      -o <out_dir>     Set the output directory
                       Default: '${out_dir}'
      -p PACKAGE(S)    Package(s) to install, can be used multiple times
-     -r <run_cmd>     Set a command to be run in chroot (only relevant for legacy 'run' command)
-                      NOTE: Deprecated, will be removed with archiso v49
      -s <sfs_mode>    Set SquashFS image mode (img or sfs)
                       img: prepare airootfs.sfs for dm-snapshot usage
                       sfs: prepare airootfs.sfs for overlayfs usage
@@ -126,21 +124,6 @@ usage ${app_name} [options] <profile_dir or legacy_command>
                       Default: '${work_dir}'
 
   profile_dir:        Directory of the archiso profile to build
-
-  legacy_command:     Legacy build.sh command
-                      NOTE: Deprecated, will be removed with archiso v49
-    init
-        initialize a chroot for building
-    install
-        install packages to the chroot
-    run
-        run a command in the chroot
-    prepare
-        cleanup and prepare the airootfs
-    pkglist
-        create a list of packages installed on the medium
-    iso
-        create the ISO
 ENDUSAGETEXT
     printf '%s' "${usagetext}"
     exit "${1}"
@@ -149,51 +132,23 @@ ENDUSAGETEXT
 # Shows configuration according to command mode.
 # $1: build_profile | init | install | run | prepare | iso
 _show_config() {
-    local _mode="$1" build_date
+    local build_date
     build_date="$(date --utc --iso-8601=seconds -d "@${SOURCE_DATE_EPOCH}")"
     _msg_info "${app_name} configuration settings"
-    [[ ! -d "${command_name}" ]] && _msg_info "           Legacy Command:   ${command_name}"
     _msg_info "             Architecture:   ${arch}"
     _msg_info "        Working directory:   ${work_dir}"
     _msg_info "   Installation directory:   ${install_dir}"
-    case "${_mode}" in
-        build_profile)
-            _msg_info "               Build date:   ${build_date}"
-            _msg_info "         Output directory:   ${out_dir}"
-            _msg_info "                  GPG key:   ${gpg_key:-None}"
-            _msg_info "                  Profile:   ${profile}"
-            _msg_info "Pacman configuration file:   ${pacman_conf}"
-            _msg_info "          Image file name:   ${img_name}"
-            _msg_info "         ISO volume label:   ${iso_label}"
-            _msg_info "            ISO publisher:   ${iso_publisher}"
-            _msg_info "          ISO application:   ${iso_application}"
-            _msg_info "               Boot modes:   ${bootmodes[*]}"
-            _msg_info "                 Packages:   ${pkg_list[*]}"
-            ;;
-        init)
-            _msg_info "Pacman configuration file:   ${pacman_conf}"
-            ;;
-        install)
-            _msg_info "                  GPG key:   ${gpg_key:-None}"
-            _msg_info "Pacman configuration file:   ${pacman_conf}"
-            _msg_info "                 Packages:   ${pkg_list[*]}"
-            ;;
-        run)
-            _msg_info "              Run command:   ${run_cmd}"
-            ;;
-        prepare)
-            _msg_info "                  GPG key:   ${gpg_key:-None}"
-            ;;
-        pkglist)
-            ;;
-        iso)
-            _msg_info "         Output directory:   ${out_dir}"
-            _msg_info "          Image file name:   ${img_name}"
-            _msg_info "         ISO volume label:   ${iso_label}"
-            _msg_info "            ISO publisher:   ${iso_publisher}"
-            _msg_info "          ISO application:   ${iso_application}"
-            ;;
-    esac
+    _msg_info "               Build date:   ${build_date}"
+    _msg_info "         Output directory:   ${out_dir}"
+    _msg_info "                  GPG key:   ${gpg_key:-None}"
+    _msg_info "                  Profile:   ${profile}"
+    _msg_info "Pacman configuration file:   ${pacman_conf}"
+    _msg_info "          Image file name:   ${img_name}"
+    _msg_info "         ISO volume label:   ${iso_label}"
+    _msg_info "            ISO publisher:   ${iso_publisher}"
+    _msg_info "          ISO application:   ${iso_application}"
+    _msg_info "               Boot modes:   ${bootmodes[*]}"
+    _msg_info "                 Packages:   ${pkg_list[*]}"
     [[ "${quiet}" == "y" ]] || printf '\n'
 }
 
@@ -823,60 +778,7 @@ _make_pkglist() {
     _msg_info "Done!"
 }
 
-command_pkglist() {
-    _show_config "${FUNCNAME[0]#command_}"
-    _make_pkglist
-}
-
-# Create an ISO9660 filesystem from "iso" directory.
-command_iso() {
-    bootmodes=('bios.syslinux.mbr' 'bios.syslinux.eltorito')
-
-    # If exists, add an EFI "El Torito" boot image (FAT filesystem) to ISO-9660 image.
-    if [[ -f "${work_dir}/efiboot.img" ]]; then
-        bootmodes+=('uefi-x64.systemd-boot.esp' 'uefi-x64.systemd-boot.eltorito')
-    fi
-
-    _show_config "${FUNCNAME[0]#command_}"
-    _make_iso
-}
-
-# create airootfs.sfs filesystem, and push it in "iso" directory.
-command_prepare() {
-    _show_config "${FUNCNAME[0]#command_}"
-
-    _cleanup
-    _make_prepare
-}
-
-# Install packages on airootfs.
-# A basic check to avoid double execution/reinstallation is done via hashing package names.
-command_install() {
-    if [[ ! -f "${pacman_conf}" ]]; then
-        _msg_error "Pacman config file '${pacman_conf}' does not exist" 1
-    fi
-
-    if (( ${#pkg_list[@]} == 0 )); then
-        _msg_error "Packages must be specified" 0
-        _usage 1
-    fi
-
-    _show_config "${FUNCNAME[0]#command_}"
-
-    _make_packages
-}
-
-command_init() {
-    _show_config "${FUNCNAME[0]#command_}"
-    _chroot_init
-}
-
-command_run() {
-    _show_config "${FUNCNAME[0]#command_}"
-    _chroot_run
-}
-
-command_build_profile() {
+_build_profile() {
     # Set up essential directory paths
     airootfs_dir="${work_dir}/${arch}/airootfs"
     isofs_dir="${work_dir}/iso"
@@ -891,7 +793,7 @@ command_build_profile() {
         printf '%s\n' "$SOURCE_DATE_EPOCH" > "${work_dir}/build_date"
     fi
 
-    _show_config "${FUNCNAME[0]#command_}"
+    _show_config
     _run_once _make_pacman_conf
     _run_once _export_gpg_publickey
     _run_once _make_custom_airootfs
@@ -933,7 +835,7 @@ done
 shift $((OPTIND - 1))
 
 if (( $# < 1 )); then
-    _msg_error "No command specified" 0
+    _msg_error "No profile specified" 0
     _usage 1
 fi
 
@@ -941,55 +843,14 @@ if (( EUID != 0 )); then
     _msg_error "${app_name} must be run as root." 1
 fi
 
-command_name="${1}"
+# get the absolute path representation of the first non-option argument
+profile="$(realpath -- "${1}")"
 
 # Set directory path defaults for legacy commands
 airootfs_dir="${work_dir}/airootfs"
 isofs_dir="${work_dir}/iso"
-
-case "${command_name}" in
-    init)
-        _msg_warning "The '${command_name}' command is deprecated! It will be removed with archiso v49."
-        _set_overrides
-        command_init
-        ;;
-    install)
-        _msg_warning "The '${command_name}' command is deprecated! It will be removed with archiso v49."
-        _set_overrides
-        command_install
-        ;;
-    run)
-        _msg_warning "The '${command_name}' command is deprecated! It will be removed with archiso v49."
-        command_run
-        ;;
-    prepare)
-        _msg_warning "The '${command_name}' command is deprecated! It will be removed with archiso v49."
-        _set_overrides
-        command_prepare
-        ;;
-    pkglist)
-        _msg_warning "The '${command_name}' command is deprecated! It will be removed with archiso v49."
-        command_pkglist
-        ;;
-    iso)
-        _msg_warning "The '${command_name}' command is deprecated! It will be removed with archiso v49."
-        if (( $# < 2 )); then
-            _msg_error "No image specified" 0
-            _usage 1
-        fi
-        img_name="${2}"
-        _set_overrides
-        command_iso
-        ;;
-    *)
-        # NOTE: we call read_profile here, assuming that the first non-option parameter is a profile directory
-        # This way we can retain backwards compatibility with legacy build.sh scripts until we deprecate the old way of
-        # calling mkarchiso with named parameters in v49
-        profile="$(realpath -- "${command_name}")"
-        _read_profile
-        _set_overrides
-        command_build_profile
-        ;;
-esac
+_read_profile
+_set_overrides
+_build_profile
 
 # vim:ts=4:sw=4:et:
diff --git a/configs/baseline/build.sh b/configs/baseline/build.sh
deleted file mode 100755
index 0573599..0000000
--- a/configs/baseline/build.sh
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/usr/bin/env bash
-#
-# SPDX-License-Identifier: GPL-3.0-or-later
-
-printf '\n[%s] WARNING: %s\n\n' "mkarchiso" "build.sh scripts are deprecated! Please use mkarchiso directly." >&2
-_buildsh_path="$(realpath -- "$0")"
-exec mkarchiso "$@" "${_buildsh_path%/*}"
diff --git a/configs/releng/build.sh b/configs/releng/build.sh
deleted file mode 100755
index 0573599..0000000
--- a/configs/releng/build.sh
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/usr/bin/env bash
-#
-# SPDX-License-Identifier: GPL-3.0-or-later
-
-printf '\n[%s] WARNING: %s\n\n' "mkarchiso" "build.sh scripts are deprecated! Please use mkarchiso directly." >&2
-_buildsh_path="$(realpath -- "$0")"
-exec mkarchiso "$@" "${_buildsh_path%/*}"
-- 
cgit v1.2.3-70-g09d2


From 9f16862acd7e7be02da72f63a03b4c0e256dabff Mon Sep 17 00:00:00 2001
From: fdupoux <fdupoux@users.sourceforge.net>
Date: Fri, 30 Oct 2020 21:20:05 +0000
Subject: Configure the image type and image creation options using profiles
 (#54)

---
 AUTHORS.rst        |  1 +
 README.profile.rst |  5 +++++
 archiso/mkarchiso  | 53 ++++++++++++++++++++++++++---------------------------
 3 files changed, 32 insertions(+), 27 deletions(-)

(limited to 'archiso/mkarchiso')

diff --git a/AUTHORS.rst b/AUTHORS.rst
index 536c15c..cc2c3e0 100644
--- a/AUTHORS.rst
+++ b/AUTHORS.rst
@@ -15,6 +15,7 @@ Archiso Authors
 * Dieter Plaetinck <dieter@plaetinck.be>
 * Eli Schwartz <eschwartz@archlinux.org>
 * Florian Pritz <bluewind@xinu.at>
+* Francois Dupoux <fdupoux@users.sourceforge.net>
 * Gerardo Exequiel Pozzi <vmlinuz386@gmail.com>
 * Gerhard Brauer <gerbra@archlinux.de>
 * James Sitegen <jamesm.sitegen@gmail.com>
diff --git a/README.profile.rst b/README.profile.rst
index 94cecdd..70f0b30 100644
--- a/README.profile.rst
+++ b/README.profile.rst
@@ -44,6 +44,11 @@ The image file is constructed from some of the variables in **profiledef.sh**: `
   file (e.g. `packages.x86_64`)
 * `pacman_conf`: The `pacman.conf` to use to install packages to the work directory when creating the image (defaults to
   the host's `/etc/pacman.conf`)
+* `airootfs_image_type`: The image type to create. The following options are understood (defaults to `squashfs`):
+  - `squashfs`: Create a squashfs image directly from the airootfs work directory
+  - `ext4+squashfs`: Create an ext4 partition, copy the airootfs work directory to it and create a squashfs image from it
+* `airootfs_image_tool_options`: An array of options to pass to the tool to create the airootfs image. Currently only
+  `mksquashfs` is supported - see `mksquashfs --help` for all possible options (defaults to `('-comp' 'xz')`).
 
 packages.arch
 =============
diff --git a/archiso/mkarchiso b/archiso/mkarchiso
index 5bb042c..13cee6a 100755
--- a/archiso/mkarchiso
+++ b/archiso/mkarchiso
@@ -17,8 +17,6 @@ quiet="y"
 work_dir="work"
 out_dir="out"
 img_name="${app_name}.iso"
-sfs_mode="sfs"
-sfs_comp="xz"
 gpg_key=""
 override_gpg_key=""
 
@@ -38,6 +36,8 @@ arch="$(uname -m)"
 pacman_conf="/etc/pacman.conf"
 override_pacman_conf=""
 bootmodes=()
+airootfs_image_type="squashfs"
+airootfs_image_tool_options=('-comp' 'xz')
 
 
 # Show an INFO message
@@ -108,17 +108,11 @@ usage: ${app_name} [options] <profile_dir>
                       Default: '${iso_label}'
      -P <publisher>   Set the ISO publisher
                       Default: '${iso_publisher}'
-     -c <comp_type>   Set SquashFS compression type (gzip, lzma, lzo, xz, zstd)
-                      Default: '${sfs_comp}'
      -g <gpg_key>     Set the GPG key to be used for signing the sqashfs image
      -h               This message
      -o <out_dir>     Set the output directory
                       Default: '${out_dir}'
      -p PACKAGE(S)    Package(s) to install, can be used multiple times
-     -s <sfs_mode>    Set SquashFS image mode (img or sfs)
-                      img: prepare airootfs.sfs for dm-snapshot usage
-                      sfs: prepare airootfs.sfs for overlayfs usage
-                      Default: '${sfs_mode}'
      -v               Enable verbose output
      -w <work_dir>    Set the working directory
                       Default: '${work_dir}'
@@ -201,6 +195,23 @@ _cleanup() {
     _msg_info "Done!"
 }
 
+_mkairootfs_create_image() {
+    if (( $# < 1 )); then
+        _msg_error "Function '${FUNCNAME[0]}' requires at least one argument" 1
+    fi
+
+    image_path="${isofs_dir}/${install_dir}/${arch}/airootfs.sfs"
+    if [[ "${airootfs_image_type}" =~ .*squashfs ]] ; then
+        if [[ "${quiet}" == "y" ]]; then
+            mksquashfs "$@" "${image_path}" -noappend "${airootfs_image_tool_options[@]}" -no-progress > /dev/null
+        else
+            mksquashfs "$@" "${image_path}" -noappend "${airootfs_image_tool_options[@]}"
+        fi
+    else
+        _msg_error "Unsupported image type: '${airootfs_image_type}'" 1
+    fi
+}
+
 # Makes a ext4 filesystem inside a SquashFS from a source directory.
 _mkairootfs_img() {
     if [[ ! -e "${airootfs_dir}" ]]; then
@@ -223,13 +234,7 @@ _mkairootfs_img() {
     _umount_airootfs
     install -d -m 0755 -- "${isofs_dir}/${install_dir}/${arch}"
     _msg_info "Creating SquashFS image, this may take some time..."
-    if [[ "${quiet}" = "y" ]]; then
-        mksquashfs "${airootfs_dir}.img" "${isofs_dir}/${install_dir}/${arch}/airootfs.sfs" -noappend \
-            -comp "${sfs_comp}" -no-progress > /dev/null
-    else
-        mksquashfs "${airootfs_dir}.img" "${isofs_dir}/${install_dir}/${arch}/airootfs.sfs" -noappend \
-            -comp "${sfs_comp}"
-    fi
+    _mkairootfs_create_image "${airootfs_dir}.img"
     _msg_info "Done!"
     rm -- "${airootfs_dir}.img"
 }
@@ -242,13 +247,7 @@ _mkairootfs_sfs() {
 
     install -d -m 0755 -- "${isofs_dir}/${install_dir}/${arch}"
     _msg_info "Creating SquashFS image, this may take some time..."
-    if [[ "${quiet}" = "y" ]]; then
-        mksquashfs "${airootfs_dir}" "${isofs_dir}/${install_dir}/${arch}/airootfs.sfs" -noappend \
-            -comp "${sfs_comp}" -no-progress > /dev/null
-    else
-        mksquashfs "${airootfs_dir}" "${isofs_dir}/${install_dir}/${arch}/airootfs.sfs" -noappend \
-            -comp "${sfs_comp}"
-    fi
+    _mkairootfs_create_image "${airootfs_dir}"
     _msg_info "Done!"
 }
 
@@ -573,10 +572,12 @@ _make_boot_uefi-x64.systemd-boot.eltorito() {
 
 # Build airootfs filesystem image
 _make_prepare() {
-    if [[ "${sfs_mode}" == "sfs" ]]; then
+    if [[ "${airootfs_image_type}" == "squashfs" ]]; then # prepare airootfs.sfs for overlayfs usage (default)
         _run_once _mkairootfs_sfs
-    else
+    elif [[ "${airootfs_image_type}" == "ext4+squashfs" ]]; then # prepare airootfs.sfs for dm-snapshot usage
         _run_once _mkairootfs_img
+    else
+        _msg_error "Unsupported image type: '${airootfs_image_type}'" 1
     fi
     _mkchecksum
     if [[ "${gpg_key}" ]]; then
@@ -806,7 +807,7 @@ _build_profile() {
     _run_once _make_iso
 }
 
-while getopts 'p:r:C:L:P:A:D:w:o:s:c:g:vh?' arg; do
+while getopts 'p:r:C:L:P:A:D:w:o:g:vh?' arg; do
     case "${arg}" in
         p)
             read -r -a opt_pkg_list <<< "${OPTARG}"
@@ -820,8 +821,6 @@ while getopts 'p:r:C:L:P:A:D:w:o:s:c:g:vh?' arg; do
         D) override_install_dir="${OPTARG}" ;;
         w) work_dir="$(realpath -- "${OPTARG}")" ;;
         o) out_dir="$(realpath -- "${OPTARG}")" ;;
-        s) sfs_mode="${OPTARG}" ;;
-        c) sfs_comp="${OPTARG}" ;;
         g) override_gpg_key="${OPTARG}" ;;
         v) quiet="n" ;;
         h|?) _usage 0 ;;
-- 
cgit v1.2.3-70-g09d2


From 57d510fe7f13ad2a5b1732842572d1553c2d8eb6 Mon Sep 17 00:00:00 2001
From: nl6720 <nl6720@gmail.com>
Date: Sun, 1 Nov 2020 09:39:36 +0200
Subject: mkarchiso: general cleanup and simplification

- Remove remnants of the now removed legacy commands.
- Improve readability by getting rid of some "if" statements when performing string comparisons.
- Rename functions to make their purpose more clear.
- Move some conditions from functions to their invocations.
---
 archiso/mkarchiso | 199 ++++++++++++++++++------------------------------------
 1 file changed, 67 insertions(+), 132 deletions(-)

(limited to 'archiso/mkarchiso')

diff --git a/archiso/mkarchiso b/archiso/mkarchiso
index 13cee6a..17f4203 100755
--- a/archiso/mkarchiso
+++ b/archiso/mkarchiso
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 #
 # SPDX-License-Identifier: GPL-3.0-or-later
 
@@ -12,7 +12,6 @@ export SOURCE_DATE_EPOCH="${SOURCE_DATE_EPOCH:-"$(date +%s)"}"
 # mkarchiso defaults
 app_name="${0##*/}"
 pkg_list=()
-run_cmd=""
 quiet="y"
 work_dir="work"
 out_dir="out"
@@ -66,15 +65,6 @@ _msg_error() {
     fi
 }
 
-_chroot_init() {
-    install -d -m 0755 -o 0 -g 0 -- "${airootfs_dir}"
-    _pacman base syslinux
-}
-
-_chroot_run() {
-    eval -- arch-chroot "${airootfs_dir}" "${run_cmd}"
-}
-
 _mount_airootfs() {
     trap "_umount_airootfs" EXIT HUP INT TERM
     install -d -m 0755 -- "${work_dir}/mnt/airootfs"
@@ -123,8 +113,7 @@ ENDUSAGETEXT
     exit "${1}"
 }
 
-# Shows configuration according to command mode.
-# $1: build_profile | init | install | run | prepare | iso
+# Shows configuration options.
 _show_config() {
     local build_date
     build_date="$(date --utc --iso-8601=seconds -d "@${SOURCE_DATE_EPOCH}")"
@@ -143,50 +132,24 @@ _show_config() {
     _msg_info "          ISO application:   ${iso_application}"
     _msg_info "               Boot modes:   ${bootmodes[*]}"
     _msg_info "                 Packages:   ${pkg_list[*]}"
-    [[ "${quiet}" == "y" ]] || printf '\n'
-}
-
-# Install desired packages to airootfs
-_pacman() {
-    _msg_info "Installing packages to '${airootfs_dir}/'..."
-
-    if [[ "${quiet}" = "y" ]]; then
-        pacstrap -C "${work_dir}/pacman.conf" -c -G -M -- "${airootfs_dir}" "$@" &> /dev/null
-    else
-        pacstrap -C "${work_dir}/pacman.conf" -c -G -M -- "${airootfs_dir}" "$@"
-    fi
-
-    _msg_info "Done! Packages installed successfully."
 }
 
 # Cleanup airootfs
-_cleanup() {
+_cleanup_airootfs() {
     _msg_info "Cleaning up what we can on airootfs..."
 
     # Delete all files in /boot
-    if [[ -d "${airootfs_dir}/boot" ]]; then
-        find "${airootfs_dir}/boot" -mindepth 1 -delete
-    fi
+    [[ -d "${airootfs_dir}/boot" ]] && find "${airootfs_dir}/boot" -mindepth 1 -delete
     # Delete pacman database sync cache files (*.tar.gz)
-    if [[ -d "${airootfs_dir}/var/lib/pacman" ]]; then
-        find "${airootfs_dir}/var/lib/pacman" -maxdepth 1 -type f -delete
-    fi
+    [[ -d "${airootfs_dir}/var/lib/pacman" ]] && find "${airootfs_dir}/var/lib/pacman" -maxdepth 1 -type f -delete
     # Delete pacman database sync cache
-    if [[ -d "${airootfs_dir}/var/lib/pacman/sync" ]]; then
-        find "${airootfs_dir}/var/lib/pacman/sync" -delete
-    fi
+    [[ -d "${airootfs_dir}/var/lib/pacman/sync" ]] && find "${airootfs_dir}/var/lib/pacman/sync" -delete
     # Delete pacman package cache
-    if [[ -d "${airootfs_dir}/var/cache/pacman/pkg" ]]; then
-        find "${airootfs_dir}/var/cache/pacman/pkg" -type f -delete
-    fi
+    [[ -d "${airootfs_dir}/var/cache/pacman/pkg" ]] && find "${airootfs_dir}/var/cache/pacman/pkg" -type f -delete
     # Delete all log files, keeps empty dirs.
-    if [[ -d "${airootfs_dir}/var/log" ]]; then
-        find "${airootfs_dir}/var/log" -type f -delete
-    fi
+    [[ -d "${airootfs_dir}/var/log" ]] && find "${airootfs_dir}/var/log" -type f -delete
     # Delete all temporary files and dirs
-    if [[ -d "${airootfs_dir}/var/tmp" ]]; then
-        find "${airootfs_dir}/var/tmp" -mindepth 1 -delete
-    fi
+    [[ -d "${airootfs_dir}/var/tmp" ]] && find "${airootfs_dir}/var/tmp" -mindepth 1 -delete
     # Delete package pacman related files.
     find "${work_dir}" \( -name '*.pacnew' -o -name '*.pacsave' -o -name '*.pacorig' \) -delete
     # Create an empty /etc/machine-id
@@ -195,28 +158,18 @@ _cleanup() {
     _msg_info "Done!"
 }
 
-_mkairootfs_create_image() {
-    if (( $# < 1 )); then
-        _msg_error "Function '${FUNCNAME[0]}' requires at least one argument" 1
-    fi
-
-    image_path="${isofs_dir}/${install_dir}/${arch}/airootfs.sfs"
-    if [[ "${airootfs_image_type}" =~ .*squashfs ]] ; then
-        if [[ "${quiet}" == "y" ]]; then
-            mksquashfs "$@" "${image_path}" -noappend "${airootfs_image_tool_options[@]}" -no-progress > /dev/null
-        else
-            mksquashfs "$@" "${image_path}" -noappend "${airootfs_image_tool_options[@]}"
-        fi
+_run_mksquashfs() {
+    local image_path="${isofs_dir}/${install_dir}/${arch}/airootfs.sfs"
+    if [[ "${quiet}" == "y" ]]; then
+        mksquashfs "$@" "${image_path}" -noappend "${airootfs_image_tool_options[@]}" -no-progress > /dev/null
     else
-        _msg_error "Unsupported image type: '${airootfs_image_type}'" 1
+        mksquashfs "$@" "${image_path}" -noappend "${airootfs_image_tool_options[@]}"
     fi
 }
 
 # Makes a ext4 filesystem inside a SquashFS from a source directory.
-_mkairootfs_img() {
-    if [[ ! -e "${airootfs_dir}" ]]; then
-        _msg_error "The path '${airootfs_dir}' does not exist" 1
-    fi
+_mkairootfs_ext4+squashfs() {
+    [[ -e "${airootfs_dir}" ]] || _msg_error "The path '${airootfs_dir}' does not exist" 1
 
     _msg_info "Creating ext4 image of 32 GiB..."
     if [[ "${quiet}" == "y" ]]; then
@@ -234,20 +187,18 @@ _mkairootfs_img() {
     _umount_airootfs
     install -d -m 0755 -- "${isofs_dir}/${install_dir}/${arch}"
     _msg_info "Creating SquashFS image, this may take some time..."
-    _mkairootfs_create_image "${airootfs_dir}.img"
+    _run_mksquashfs "${airootfs_dir}.img"
     _msg_info "Done!"
     rm -- "${airootfs_dir}.img"
 }
 
 # Makes a SquashFS filesystem from a source directory.
-_mkairootfs_sfs() {
-    if [[ ! -e "${airootfs_dir}" ]]; then
-        _msg_error "The path '${airootfs_dir}' does not exist" 1
-    fi
+_mkairootfs_squashfs() {
+    [[ -e "${airootfs_dir}" ]] || _msg_error "The path '${airootfs_dir}' does not exist" 1
 
     install -d -m 0755 -- "${isofs_dir}/${install_dir}/${arch}"
     _msg_info "Creating SquashFS image, this may take some time..."
-    _mkairootfs_create_image "${airootfs_dir}"
+    _run_mksquashfs "${airootfs_dir}"
     _msg_info "Done!"
 }
 
@@ -334,17 +285,27 @@ _make_custom_airootfs() {
     fi
 }
 
-# Packages (airootfs)
+# Install desired packages to airootfs
 _make_packages() {
+    _msg_info "Installing packages to '${airootfs_dir}/'..."
+
     if [[ -n "${gpg_key}" ]]; then
         exec {ARCHISO_GNUPG_FD}<>"${work_dir}/pubkey.gpg"
         export ARCHISO_GNUPG_FD
     fi
-    _pacman "${pkg_list[@]}"
+
+    if [[ "${quiet}" = "y" ]]; then
+        pacstrap -C "${work_dir}/pacman.conf" -c -G -M -- "${airootfs_dir}" "${pkg_list[@]}" &> /dev/null
+    else
+        pacstrap -C "${work_dir}/pacman.conf" -c -G -M -- "${airootfs_dir}" "${pkg_list[@]}"
+    fi
+
     if [[ -n "${gpg_key}" ]]; then
         exec {ARCHISO_GNUPG_FD}<&-
         unset ARCHISO_GNUPG_FD
     fi
+
+    _msg_info "Done! Packages installed successfully."
 }
 
 # Customize installation (airootfs)
@@ -368,8 +329,7 @@ _make_customize_airootfs() {
     if [[ -e "${airootfs_dir}/root/customize_airootfs.sh" ]]; then
         _msg_info "Running customize_airootfs.sh in '${airootfs_dir}' chroot..."
         _msg_warning "customize_airootfs.sh is deprecated! Support for it will be removed in a future archiso version."
-        local run_cmd="/root/customize_airootfs.sh"
-        _chroot_run
+        eval -- arch-chroot "${airootfs_dir}" "/root/customize_airootfs.sh"
         rm -- "${airootfs_dir}/root/customize_airootfs.sh"
         _msg_info "Done! customize_airootfs.sh run successfully."
     fi
@@ -379,8 +339,8 @@ _make_customize_airootfs() {
 _make_bootmodes() {
     local bootmode
     for bootmode in "${bootmodes[@]}"; do
-        if typeset -f "_make_boot_${bootmode}" &> /dev/null; then
-            _run_once "_make_boot_${bootmode}"
+        if typeset -f "_make_bootmode_${bootmode}" &> /dev/null; then
+            _run_once "_make_bootmode_${bootmode}"
         else
             _msg_error "${bootmode} is not a valid boot mode" 1
         fi
@@ -388,7 +348,7 @@ _make_bootmodes() {
 }
 
 # Prepare kernel/initramfs ${install_dir}/boot/
-_make_boot_on_iso() {
+_make_boot_on_iso9660() {
     local ucode_image
     _msg_info "Preparing kernel and intramfs for the ISO 9660 file system..."
     install -d -m 0755 -- "${isofs_dir}/${install_dir}/boot/${arch}"
@@ -409,7 +369,7 @@ _make_boot_on_iso() {
 }
 
 # Prepare /${install_dir}/boot/syslinux
-_make_boot_bios.syslinux.mbr() {
+_make_bootmode_bios.syslinux.mbr() {
     _msg_info "Setting up SYSLINUX for BIOS booting from a disk..."
     install -d -m 0755 -- "${isofs_dir}/${install_dir}/boot/syslinux"
     for _cfg in "${profile}/syslinux/"*.cfg; do
@@ -425,7 +385,7 @@ _make_boot_bios.syslinux.mbr() {
     install -m 0644 -- "${airootfs_dir}/usr/lib/syslinux/bios/lpxelinux.0" "${isofs_dir}/${install_dir}/boot/syslinux/"
     install -m 0644 -- "${airootfs_dir}/usr/lib/syslinux/bios/memdisk" "${isofs_dir}/${install_dir}/boot/syslinux/"
 
-    _run_once _make_boot_on_iso
+    _run_once _make_boot_on_iso9660
 
     if [[ -e "${isofs_dir}/${install_dir}/boot/syslinux/hdt.c32" ]]; then
         install -d -m 0755 -- "${isofs_dir}/${install_dir}/boot/syslinux/hdt"
@@ -449,7 +409,7 @@ _make_boot_bios.syslinux.mbr() {
 }
 
 # Prepare /isolinux
-_make_boot_bios.syslinux.eltorito() {
+_make_bootmode_bios.syslinux.eltorito() {
     _msg_info "Setting up SYSLINUX for BIOS booting from an optical disc..."
     install -d -m 0755 -- "${isofs_dir}/isolinux"
     for _cfg in "${profile}/isolinux/"*".cfg"; do
@@ -463,13 +423,13 @@ _make_boot_bios.syslinux.eltorito() {
     install -m 0644 -- "${airootfs_dir}/usr/lib/syslinux/bios/ldlinux.c32" "${isofs_dir}/isolinux/"
 
     # isolinux.cfg loads syslinux.cfg
-    _run_once _make_boot_bios.syslinux.mbr
+    _run_once _make_bootmode_bios.syslinux.mbr
 
     _msg_info "Done! SYSLINUX set up for BIOS booting from an optical disc successfully."
 }
 
 # Prepare /EFI on ISO-9660
-_make_efi() {
+_make_efi_dir_on_iso9660() {
     _msg_info "Preparing an /EFI directory for the ISO 9660 file system..."
     install -d -m 0755 -- "${isofs_dir}/EFI/BOOT"
     install -m 0644 -- "${airootfs_dir}/usr/lib/systemd/boot/efi/systemd-bootx64.efi" \
@@ -515,7 +475,7 @@ _make_boot_on_fat() {
 }
 
 # Prepare efiboot.img::/EFI for EFI boot mode
-_make_boot_uefi-x64.systemd-boot.esp() {
+_make_bootmode_uefi-x64.systemd-boot.esp() {
     local efiboot_imgsize="0"
     _msg_info "Setting up systemd-boot for UEFI booting..."
 
@@ -564,36 +524,31 @@ _make_boot_uefi-x64.systemd-boot.esp() {
 }
 
 # Prepare efiboot.img::/EFI for "El Torito" EFI boot mode
-_make_boot_uefi-x64.systemd-boot.eltorito() {
-    _run_once _make_boot_uefi-x64.systemd-boot.esp
-    # Set up /EFI on ISO-9660
-    _run_once _make_efi
+_make_bootmode_uefi-x64.systemd-boot.eltorito() {
+    _run_once _make_bootmode_uefi-x64.systemd-boot.esp
+    # Set up /EFI on ISO-9660 to allow preparing an installation medium by manually copying files
+    _run_once _make_efi_dir_on_iso9660
 }
 
 # Build airootfs filesystem image
-_make_prepare() {
-    if [[ "${airootfs_image_type}" == "squashfs" ]]; then # prepare airootfs.sfs for overlayfs usage (default)
-        _run_once _mkairootfs_sfs
-    elif [[ "${airootfs_image_type}" == "ext4+squashfs" ]]; then # prepare airootfs.sfs for dm-snapshot usage
-        _run_once _mkairootfs_img
+_prepare_airootfs_image() {
+    if typeset -f "_mkairootfs_${airootfs_image_type}" &> /dev/null; then
+        _run_once "_mkairootfs_${airootfs_image_type}"
     else
         _msg_error "Unsupported image type: '${airootfs_image_type}'" 1
     fi
+
     _mkchecksum
-    if [[ "${gpg_key}" ]]; then
-      _mksignature
-    fi
+    [[ -n "${gpg_key}" ]] && _mksignature
 }
 
 # Build ISO
-_make_iso() {
+_build_iso() {
     local xorrisofs_options=()
 
     [[ -d "${out_dir}" ]] || install -d -- "${out_dir}"
 
-    if [[ "${quiet}" == "y" ]]; then
-        xorrisofs_options+=('-quiet')
-    fi
+    [[ "${quiet}" == "y" ]] && xorrisofs_options+=('-quiet')
 
     # xorrisofs options for x86 BIOS booting using SYSLINUX
     # shellcheck disable=SC2076
@@ -647,9 +602,7 @@ _make_iso() {
     # xorrisofs options for X64 UEFI booting using systemd-boot
     # shellcheck disable=SC2076
     if [[ " ${bootmodes[*]} " =~ ' uefi-x64.systemd-boot.' ]]; then
-        if [[ ! -f "${work_dir}/efiboot.img" ]]; then
-            _msg_error "The file '${work_dir}/efiboot.img' does not exist." 1
-        fi
+        [[ -f "${work_dir}/efiboot.img" ]] || _msg_error "The file '${work_dir}/efiboot.img' does not exist." 1
         [[ -e "${isofs_dir}/EFI/archiso" ]] && rm -rf -- "${isofs_dir}/EFI/archiso"
 
         # systemd-boot in an attached EFI system partition
@@ -744,31 +697,17 @@ _read_profile() {
 
 # set overrides from mkarchiso option parameters, if present
 _set_overrides() {
-    if [[ -n "$override_iso_label" ]]; then
-        iso_label="$override_iso_label"
-    fi
-    if [[ -n "$override_iso_publisher" ]]; then
-        iso_publisher="$override_iso_publisher"
-    fi
-    if [[ -n "$override_iso_application" ]]; then
-        iso_application="$override_iso_application"
-    fi
-    if [[ -n "$override_install_dir" ]]; then
-        install_dir="$override_install_dir"
-    fi
-    if [[ -n "$override_pacman_conf" ]]; then
-        pacman_conf="$override_pacman_conf"
-    fi
-    if [[ -n "$override_gpg_key" ]]; then
-        gpg_key="$override_gpg_key"
-    fi
+    [[ -n "$override_iso_label" ]] && iso_label="$override_iso_label"
+    [[ -n "$override_iso_publisher" ]] && iso_publisher="$override_iso_publisher"
+    [[ -n "$override_iso_application" ]] && iso_application="$override_iso_application"
+    [[ -n "$override_install_dir" ]] && install_dir="$override_install_dir"
+    [[ -n "$override_pacman_conf" ]] && pacman_conf="$override_pacman_conf"
+    [[ -n "$override_gpg_key" ]] && gpg_key="$override_gpg_key"
 }
 
 
 _export_gpg_publickey() {
-    if [[ -n "${gpg_key}" ]]; then
-        gpg --batch --output "${work_dir}/pubkey.gpg" --export "${gpg_key}"
-    fi
+    gpg --batch --output "${work_dir}/pubkey.gpg" --export "${gpg_key}"
 }
 
 
@@ -794,26 +733,25 @@ _build_profile() {
         printf '%s\n' "$SOURCE_DATE_EPOCH" > "${work_dir}/build_date"
     fi
 
-    _show_config
+    [[ "${quiet}" == "n" ]] && _show_config
     _run_once _make_pacman_conf
-    _run_once _export_gpg_publickey
+    [[ -n "${gpg_key}" ]] && _run_once _export_gpg_publickey
     _run_once _make_custom_airootfs
     _run_once _make_packages
     _run_once _make_customize_airootfs
     _run_once _make_pkglist
     _make_bootmodes
-    _run_once _cleanup
-    _run_once _make_prepare
-    _run_once _make_iso
+    _run_once _cleanup_airootfs
+    _run_once _prepare_airootfs_image
+    _run_once _build_iso
 }
 
-while getopts 'p:r:C:L:P:A:D:w:o:g:vh?' arg; do
+while getopts 'p:C:L:P:A:D:w:o:g:vh?' arg; do
     case "${arg}" in
         p)
             read -r -a opt_pkg_list <<< "${OPTARG}"
             pkg_list+=("${opt_pkg_list[@]}")
             ;;
-        r) run_cmd="${OPTARG}" ;;
         C) override_pacman_conf="$(realpath -- "${OPTARG}")" ;;
         L) override_iso_label="${OPTARG}" ;;
         P) override_iso_publisher="${OPTARG}" ;;
@@ -845,9 +783,6 @@ fi
 # get the absolute path representation of the first non-option argument
 profile="$(realpath -- "${1}")"
 
-# Set directory path defaults for legacy commands
-airootfs_dir="${work_dir}/airootfs"
-isofs_dir="${work_dir}/iso"
 _read_profile
 _set_overrides
 _build_profile
-- 
cgit v1.2.3-70-g09d2


From 4dfb4737481ff34894df33638c70478991d47897 Mon Sep 17 00:00:00 2001
From: nl6720 <nl6720@gmail.com>
Date: Sun, 1 Nov 2020 11:43:56 +0200
Subject: mkarchiso: validate profile right after reading it

Fixes https://gitlab.archlinux.org/archlinux/archiso/-/issues/76 .
---
 archiso/mkarchiso | 193 +++++++++++++++++++++++++++++++++++++++++++++++++-----
 1 file changed, 177 insertions(+), 16 deletions(-)

(limited to 'archiso/mkarchiso')

diff --git a/archiso/mkarchiso b/archiso/mkarchiso
index 17f4203..2d0e29c 100755
--- a/archiso/mkarchiso
+++ b/archiso/mkarchiso
@@ -339,11 +339,7 @@ _make_customize_airootfs() {
 _make_bootmodes() {
     local bootmode
     for bootmode in "${bootmodes[@]}"; do
-        if typeset -f "_make_bootmode_${bootmode}" &> /dev/null; then
-            _run_once "_make_bootmode_${bootmode}"
-        else
-            _msg_error "${bootmode} is not a valid boot mode" 1
-        fi
+        _run_once "_make_bootmode_${bootmode}"
     done
 }
 
@@ -530,18 +526,141 @@ _make_bootmode_uefi-x64.systemd-boot.eltorito() {
     _run_once _make_efi_dir_on_iso9660
 }
 
-# Build airootfs filesystem image
-_prepare_airootfs_image() {
-    if typeset -f "_mkairootfs_${airootfs_image_type}" &> /dev/null; then
-        _run_once "_mkairootfs_${airootfs_image_type}"
+_validate_requirements_bootmode_bios.syslinux.mbr() {
+    # bios.syslinux.mbr requires bios.syslinux.eltorito
+    # shellcheck disable=SC2076
+    if [[ ! " ${bootmodes[*]} " =~ ' bios.syslinux.eltorito ' ]]; then
+        (( validation_error=validation_error+1 ))
+        _msg_error "Using 'bios.syslinux.mbr' boot mode without 'bios.syslinux.eltorito' is not supported." 0
+    fi
+
+    # Check if the syslinux package is in the package list
+    # shellcheck disable=SC2076
+    if [[ ! " ${pkg_list[*]} " =~ ' syslinux ' ]]; then
+        (( validation_error=validation_error+1 ))
+        _msg_error "Validating '${bootmode}': The 'syslinux' package is missing from the package list!" 0
+    fi
+
+    # Check if syslinux configuration files exist
+    if [[ ! -d "${profile}/syslinux" ]]; then
+        (( validation_error=validation_error+1 ))
+        _msg_error "Validating '${bootmode}': The '${profile}/syslinux' directory is missing!" 0
     else
-        _msg_error "Unsupported image type: '${airootfs_image_type}'" 1
+        local cfgfile
+        for cfgfile in "${profile}/syslinux/"*'.cfg'; do
+            if [[ -e "${cfgfile}" ]]; then
+                break
+            else
+                (( validation_error=validation_error+1 ))
+                _msg_error "Validating '${bootmode}': No configuration file found in '${profile}/syslinux/'!" 0
+            fi
+        done
+    fi
+
+    # Check for optional packages
+    # shellcheck disable=SC2076
+    if [[ ! " ${pkg_list[*]} " =~ ' memtest86+ ' ]]; then
+        _msg_info "Validating '${bootmode}': 'memtest86+' is not in the package list. Memmory testing will not be available from syslinux."
     fi
+}
 
+_validate_requirements_bootmode_bios.syslinux.eltorito() {
+    # Check if the syslinux package is in the package list
+    # shellcheck disable=SC2076
+    if [[ ! " ${pkg_list[*]} " =~ ' syslinux ' ]]; then
+        (( validation_error=validation_error+1 ))
+        _msg_error "Validating '${bootmode}': The 'syslinux' package is missing from the package list!" 0
+    fi
+
+    # Check if isolinux configuration files exist
+    if [[ ! -d "${profile}/isolinux" ]]; then
+        (( validation_error=validation_error+1 ))
+        _msg_error "Validating '${bootmode}': The '${profile}/isolinux' directory is missing!" 0
+    else
+        local cfgfile
+        for cfgfile in "${profile}/isolinux/"*'.cfg'; do
+            if [[ -e "${cfgfile}" ]]; then
+                break
+            else
+                (( validation_error=validation_error+1 ))
+                _msg_error "Validating '${bootmode}': No configuration file found in '${profile}/isolinux/'!" 0
+            fi
+        done
+    fi
+
+    # Check for optional packages
+    # shellcheck disable=SC2076
+    if [[ ! " ${pkg_list[*]} " =~ ' memtest86+ ' ]]; then
+        _msg_info "Validating '${bootmode}': 'memtest86+' is not in the package list. Memory testing will not be available from syslinux."
+    fi
+}
+
+_validate_requirements_bootmode_uefi-x64.systemd-boot.esp() {
+    # Check if mkfs.fat is available
+    if ! command -v mkfs.fat &> /dev/null; then
+        (( validation_error=validation_error+1 ))
+        _msg_error "Validating '${bootmode}': mkfs.fat is not available on this host. Install 'dosfstools'!" 0
+    fi
+
+    # Check if mmd and mcopy are available
+    if ! { command -v mmd &> /dev/null && command -v mcopy &> /dev/null; }; then
+        _msg_error "Validating '${bootmode}': mmd and/or mcopy are not available on this host. Install 'mtools'!" 0
+    fi
+
+    # Check if systemd-boot configuration files exist
+    if [[ ! -d "${profile}/efiboot/loader/entries" ]]; then
+        (( validation_error=validation_error+1 ))
+        _msg_error "Validating '${bootmode}': The '${profile}/efiboot/loader/entries' directory is missing!" 0
+    else
+        if [[ ! -e "${profile}/efiboot/loader/loader.conf" ]]; then
+            (( validation_error=validation_error+1 ))
+            _msg_error "Validating '${bootmode}': File '${profile}/efiboot/loader/loader.conf' not found!" 0
+        fi
+        local conffile
+        for conffile in "${profile}/efiboot/loader/entries/"*'.conf'; do
+            if [[ -e "${conffile}" ]]; then
+                break
+            else
+                (( validation_error=validation_error+1 ))
+                _msg_error "Validating '${bootmode}': No configuration file found in '${profile}/efiboot/loader/entries/'!" 0
+            fi
+        done
+    fi
+
+    # Check for optional packages
+    # shellcheck disable=SC2076
+    if [[ ! " ${pkg_list[*]} " =~ ' edk2-shell ' ]]; then
+        _msg_info "'edk2-shell' is not in the package list. The ISO will not contain a bootable UEFI shell."
+    fi
+}
+
+_validate_requirements_bootmode_uefi-x64.systemd-boot.eltorito() {
+    # uefi-x64.systemd-boot.eltorito has the exact same requirements as uefi-x64.systemd-boot.esp
+    _validate_requirements_bootmode_uefi-x64.systemd-boot.esp
+}
+
+# Build airootfs filesystem image
+_prepare_airootfs_image() {
+    _run_once "_mkairootfs_${airootfs_image_type}"
     _mkchecksum
     [[ -n "${gpg_key}" ]] && _mksignature
 }
 
+_validate_requirements_airootfs_image_type_squashfs() {
+    if ! command -v mksquashfs &> /dev/null; then
+        (( validation_error=validation_error+1 ))
+        _msg_error "Validating '${airootfs_image_type}': mksquashfs is not available on this host. Install 'squashfs-tools'!" 0
+    fi
+}
+
+_validate_requirements_airootfs_image_type_ext4+squashfs() {
+    if ! { command -v mkfs.ext4 &> /dev/null && command -v tune2fs &> /dev/null; }; then
+        (( validation_error=validation_error+1 ))
+        _msg_error "Validating '${airootfs_image_type}': mkfs.ext4 and/or tune2fs is not available on this host. Install 'e2fsprogs'!" 0
+    fi
+    _validate_requirements_airootfs_image_type_squashfs
+}
+
 # Build ISO
 _build_iso() {
     local xorrisofs_options=()
@@ -594,8 +713,6 @@ _build_iso() {
                 # Required options to boot with ISOLINUX
                 '-no-emul-boot' '-boot-load-size' '4' '-boot-info-table'
             )
-        else
-            _msg_error "Using 'bios.syslinux.mbr' boot mode without 'bios.syslinux.eltorito' is not supported." 1
         fi
     fi
 
@@ -669,6 +786,9 @@ _build_iso() {
 
 # Read profile's values from profiledef.sh
 _read_profile() {
+    local validation_error=0
+    local bootmode
+
     if [[ -z "${profile}" ]]; then
         _msg_error "No profile specified!" 1
     fi
@@ -687,11 +807,52 @@ _read_profile() {
         packages="$(realpath -- "${profile}/packages.${arch}")"
         pacman_conf="$(realpath -- "${pacman_conf}")"
 
-        # Enumerate packages
-        [[ -e "${packages}" ]] || _msg_error "File '${packages}' does not exist!" 1
-        mapfile -t pkg_list < <(sed '/^[[:blank:]]*#.*/d;s/#.*//;/^[[:blank:]]*$/d' "${packages}")
-
         cd -- "${OLDPWD}"
+
+        # Validate profile
+        # Check if the package list file exists and read packages from it
+        if [[ -e "${packages}" ]]; then
+            mapfile -t pkg_list < <(sed '/^[[:blank:]]*#.*/d;s/#.*//;/^[[:blank:]]*$/d' "${packages}")
+            if (( ${#pkg_list} < 1 )); then
+                (( validation_error=validation_error+1 ))
+                _msg_error "No package specified in '${packages}'." 0
+            fi
+        else
+            (( validation_error=validation_error+1 ))
+            _msg_error "File '${packages}' does not exist." 0
+        fi
+        # Check if pacman configuration file exists
+        if [[ ! -e "${pacman_conf}" ]]; then
+            (( validation_error=validation_error+1 ))
+            _msg_error "File '${pacman_conf}' does not exist." 0
+        fi
+        # Check if the specified bootmodes are supported
+        for bootmode in "${bootmodes[@]}"; do
+            if typeset -f "_make_bootmode_${bootmode}" &> /dev/null; then
+                if typeset -f "_validate_requirements_bootmode_${bootmode}" &> /dev/null; then
+                    "_validate_requirements_bootmode_${bootmode}"
+                else
+                    _msg_warning "Function '_validate_requirements_bootmode_${bootmode}' does not exist. Validating the requirements of '${bootmode}' boot mode will not be possible."
+                fi
+            else
+                (( validation_error=validation_error+1 ))
+                _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
+                "_validate_requirements_airootfs_image_type_${airootfs_image_type}"
+            else
+                _msg_warning "Function '_validate_requirements_airootfs_image_type_${airootfs_image_type}' does not exist. Validating the requirements of '${airootfs_image_type}' airootfs image type will not be possible."
+            fi
+        else
+            (( validation_error=validation_error+1 ))
+            _msg_error "Unsupported image type: '${airootfs_image_type}'" 0
+        fi
+        if (( validation_error )); then
+            _msg_error "${validation_error} errors were encountered while validating the profile. Aborting." 1
+        fi
     fi
 }
 
-- 
cgit v1.2.3-70-g09d2


From 96ac5e24541a7a39e08d393f1fba0d8b6abe4b72 Mon Sep 17 00:00:00 2001
From: nl6720 <nl6720@gmail.com>
Date: Sun, 1 Nov 2020 15:39:27 +0200
Subject: mkarchiso: add xorrisofs options from boot mode specific functions
 instead of hardcoding them in _build_iso

---
 README.profile.rst |   3 +
 archiso/mkarchiso  | 182 +++++++++++++++++++++++++----------------------------
 2 files changed, 89 insertions(+), 96 deletions(-)

(limited to 'archiso/mkarchiso')

diff --git a/README.profile.rst b/README.profile.rst
index 70f0b30..fef34f9 100644
--- a/README.profile.rst
+++ b/README.profile.rst
@@ -36,15 +36,18 @@ The image file is constructed from some of the variables in **profiledef.sh**: `
   directory on the resulting image into which all files will be installed (defaults to `mkarchiso`)
 * `bootmodes`: A list of strings, that state the supported boot modes of the resulting image. Only the following are
   understood:
+
   - `bios.syslinux.mbr`: Syslinux for x86 BIOS booting from a disk
   - `bios.syslinux.eltorito`: Syslinux for x86 BIOS booting from an optical disc
   - `uefi-x64.systemd-boot.esp`: Systemd-boot for x86_64 UEFI booting from a disk
   - `uefi-x64.systemd-boot.eltorito`: Systemd-boot for x86_64 UEFI booting from an optical disc
+  Note that BIOS El Torito boot mode must always be listed before UEFI El Torito boot mode.
 * `arch`: The architecture (e.g. `x86_64`) to build the image for. This is also used to resolve the name of the packages
   file (e.g. `packages.x86_64`)
 * `pacman_conf`: The `pacman.conf` to use to install packages to the work directory when creating the image (defaults to
   the host's `/etc/pacman.conf`)
 * `airootfs_image_type`: The image type to create. The following options are understood (defaults to `squashfs`):
+
   - `squashfs`: Create a squashfs image directly from the airootfs work directory
   - `ext4+squashfs`: Create an ext4 partition, copy the airootfs work directory to it and create a squashfs image from it
 * `airootfs_image_tool_options`: An array of options to pass to the tool to create the airootfs image. Currently only
diff --git a/archiso/mkarchiso b/archiso/mkarchiso
index 2d0e29c..02a165f 100755
--- a/archiso/mkarchiso
+++ b/archiso/mkarchiso
@@ -661,110 +661,100 @@ _validate_requirements_airootfs_image_type_ext4+squashfs() {
     _validate_requirements_airootfs_image_type_squashfs
 }
 
+# SYSLINUX El Torito
+_add_xorrisofs_options_bios.syslinux.eltorito() {
+    xorrisofs_options+=(
+        # El Torito boot image for x86 BIOS
+        '-eltorito-boot' 'isolinux/isolinux.bin'
+        # El Torito boot catalog file
+        '-eltorito-catalog' 'isolinux/boot.cat'
+        # Required options to boot with ISOLINUX
+        '-no-emul-boot' '-boot-load-size' '4' '-boot-info-table'
+    )
+}
+
+# SYSLINUX MBR
+_add_xorrisofs_options_bios.syslinux.mbr() {
+    xorrisofs_options+=(
+        # SYSLINUX MBR bootstrap code; does not work without "-eltorito-boot isolinux/isolinux.bin"
+        '-isohybrid-mbr' "${isofs_dir}/isolinux/isohdpfx.bin"
+        # When GPT is used, create an additional partition in the MBR (besides 0xEE) for sectors 0–1 (MBR
+        # bootstrap code area) and mark it as bootable
+        # This violates the UEFI specification, but may allow booting on some systems
+        # https://wiki.archlinux.org/index.php/Partitioning#Tricking_old_BIOS_into_booting_from_GPT
+        '--mbr-force-bootable'
+        # Set the ISO 9660 partition's type to "Linux filesystem data"
+        # When only MBR is present, the partition type ID will be 0x83 "Linux" as xorriso translates all
+        # GPT partition type GUIDs except for the ESP GUID to MBR type ID 0x83
+        '-iso_mbr_part_type' '0FC63DAF-8483-4772-8E79-3D69D8477DE4'
+        # Move the first partition away from the start of the ISO to match the expectations of partition
+        # editors
+        # May allow booting on some systems
+        # https://dev.lovelyhq.com/libburnia/libisoburn/src/branch/master/doc/partition_offset.wiki
+        '-partition_offset' '16'
+    )
+}
+
+# systemd-boot in an attached EFI system partition
+_add_xorrisofs_options_uefi-x64.systemd-boot.esp() {
+    # Move the first partition away from the start of the ISO, otherwise the GPT will not be valid and ISO 9660
+    # partition will not be mountable
+    # shellcheck disable=SC2076
+    [[ " ${xorrisofs_options[*]} " =~ ' -partition_offset ' ]] || xorrisofs_options+=('-partition_offset' '16')
+    xorrisofs_options+=(
+        # Attach efiboot.img as a second partition and set its partition type to "EFI system partition"
+        '-append_partition' '2' 'C12A7328-F81F-11D2-BA4B-00A0C93EC93B' "${work_dir}/efiboot.img"
+        # Ensure GPT is used as some systems do not support UEFI booting without it
+        '-appended_part_as_gpt'
+    )
+}
+
+# systemd-boot via El Torito
+_add_xorrisofs_options_uefi-x64.systemd-boot.eltorito() {
+    # shellcheck disable=SC2076
+    if [[ " ${bootmodes[*]} " =~ ' uefi-x64.systemd-boot.esp ' ]]; then
+        # systemd-boot in an attached EFI system partition via El Torito
+        xorrisofs_options+=(
+            # Start a new El Torito boot entry for UEFI
+            '-eltorito-alt-boot'
+            # Set the second partition as the El Torito UEFI boot image
+            '-e' '--interval:appended_partition_2:all::'
+            # Boot image is not emulating floppy or hard disk; required for all known boot loaders
+            '-no-emul-boot'
+        )
+    else
+        # The ISO will not contain a GPT partition table, so to be able to reference efiboot.img, place it as a
+        # file inside the ISO 9660 file system
+        install -d -m 0755 -- "${isofs_dir}/EFI/archiso"
+        cp -a -- "${work_dir}/efiboot.img" "${isofs_dir}/EFI/archiso/efiboot.img"
+        # systemd-boot in an embedded efiboot.img via El Torito
+        xorrisofs_options+=(
+            # Start a new El Torito boot entry for UEFI
+            '-eltorito-alt-boot'
+            # Set efiboot.img as the El Torito UEFI boot image
+            '-e' 'EFI/archiso/efiboot.img'
+            # Boot image is not emulating floppy or hard disk; required for all known boot loaders
+            '-no-emul-boot'
+        )
+    fi
+    # Specify where to save the El Torito boot catalog file in case it is not already set by bios.syslinux.eltorito
+    # shellcheck disable=SC2076
+    [[ " ${bootmodes[*]} " =~ ' bios.' ]] || xorrisofs_options+=('-eltorito-catalog' 'EFI/boot.cat')
+}
+
 # Build ISO
 _build_iso() {
     local xorrisofs_options=()
+    local bootmode
 
     [[ -d "${out_dir}" ]] || install -d -- "${out_dir}"
 
     [[ "${quiet}" == "y" ]] && xorrisofs_options+=('-quiet')
 
-    # xorrisofs options for x86 BIOS booting using SYSLINUX
-    # shellcheck disable=SC2076
-    if [[ " ${bootmodes[*]} " =~ ' bios.syslinux.' ]]; then
-
-        # SYSLINUX El Torito
-        if [[ " ${bootmodes[*]} " =~ ' bios.syslinux.eltorito ' ]]; then
-            if [[ ! -f "${isofs_dir}/isolinux/isolinux.bin" ]]; then
-                _msg_error "The file '${isofs_dir}/isolinux/isolinux.bin' does not exist." 1
-            fi
-
-            # SYSLINUX MBR
-            if [[ " ${bootmodes[*]} " =~ ' bios.syslinux.mbr ' ]]; then
-                if [[ ! -f "${isofs_dir}/isolinux/isohdpfx.bin" ]]; then
-                    _msg_error "The file '${isofs_dir}/isolinux/isohdpfx.bin' does not exist." 1
-                fi
-
-                xorrisofs_options+=(
-                    # SYSLINUX MBR bootstrap code; does not work without "-eltorito-boot isolinux/isolinux.bin"
-                    '-isohybrid-mbr' "${isofs_dir}/isolinux/isohdpfx.bin"
-                    # When GPT is used, create an additional partition in the MBR (besides 0xEE) for sectors 0–1 (MBR
-                    # bootstrap code area) and mark it as bootable
-                    # This violates the UEFI specification, but may allow booting on some systems
-                    # https://wiki.archlinux.org/index.php/Partitioning#Tricking_old_BIOS_into_booting_from_GPT
-                    '--mbr-force-bootable'
-                    # Set the ISO 9660 partition's type to "Linux filesystem data"
-                    # When only MBR is present, the partition type ID will be 0x83 "Linux" as xorriso translates all
-                    # GPT partition type GUIDs except for the ESP GUID to MBR type ID 0x83
-                    '-iso_mbr_part_type' '0FC63DAF-8483-4772-8E79-3D69D8477DE4'
-                    # Move the first partition away from the start of the ISO to match the expectations of partition
-                    # editors
-                    # May allow booting on some systems
-                    # https://dev.lovelyhq.com/libburnia/libisoburn/src/branch/master/doc/partition_offset.wiki
-                    '-partition_offset' '16'
-                )
-            fi
-
-            xorrisofs_options+=(
-                # El Torito boot image for x86 BIOS
-                '-eltorito-boot' 'isolinux/isolinux.bin'
-                # El Torito boot catalog file
-                '-eltorito-catalog' 'isolinux/boot.cat'
-                # Required options to boot with ISOLINUX
-                '-no-emul-boot' '-boot-load-size' '4' '-boot-info-table'
-            )
-        fi
-    fi
-
-    # xorrisofs options for X64 UEFI booting using systemd-boot
-    # shellcheck disable=SC2076
-    if [[ " ${bootmodes[*]} " =~ ' uefi-x64.systemd-boot.' ]]; then
-        [[ -f "${work_dir}/efiboot.img" ]] || _msg_error "The file '${work_dir}/efiboot.img' does not exist." 1
-        [[ -e "${isofs_dir}/EFI/archiso" ]] && rm -rf -- "${isofs_dir}/EFI/archiso"
-
-        # systemd-boot in an attached EFI system partition
-        if [[ " ${bootmodes[*]} " =~ ' uefi-x64.systemd-boot.esp ' ]]; then
-            # Move the first partition away from the start of the ISO, otherwise the GPT will not be valid and ISO 9660
-            # partition will not be mountable
-            [[ " ${xorrisofs_options[*]} " =~ ' -partition_offset ' ]] || xorrisofs_options+=('-partition_offset' '16')
-            xorrisofs_options+=(
-                # Attach efiboot.img as a second partition and set its partition type to "EFI system partition"
-                '-append_partition' '2' 'C12A7328-F81F-11D2-BA4B-00A0C93EC93B' "${work_dir}/efiboot.img"
-                # Ensure GPT is used as some systems do not support UEFI booting without it
-                '-appended_part_as_gpt'
-            )
-
-            # systemd-boot in an attached EFI system partition via El Torito
-            if [[ " ${bootmodes[*]} " =~ ' uefi-x64.systemd-boot.eltorito ' ]]; then
-                xorrisofs_options+=(
-                    # Start a new El Torito boot entry for UEFI
-                    '-eltorito-alt-boot'
-                    # Set the second partition as the El Torito UEFI boot image
-                    '-e' '--interval:appended_partition_2:all::'
-                    # Boot image is not emulating floppy or hard disk; required for all known boot loaders
-                    '-no-emul-boot'
-                )
-            fi
-        # systemd-boot in an embedded efiboot.img via El Torito
-        elif [[ " ${bootmodes[*]} " =~ ' uefi-x64.systemd-boot.eltorito ' ]]; then
-            # The ISO will not contain a GPT partition table, so to be able to reference efiboot.img, place it as a
-            # file inside the ISO 9660 file system
-            install -d -m 0755 -- "${isofs_dir}/EFI/archiso"
-            cp -a -- "${work_dir}/efiboot.img" "${isofs_dir}/EFI/archiso/efiboot.img"
-
-            xorrisofs_options+=(
-                # Start a new El Torito boot entry for UEFI
-                '-eltorito-alt-boot'
-                # Set efiboot.img as the El Torito UEFI boot image
-                '-e' 'EFI/archiso/efiboot.img'
-                # Boot image is not emulating floppy or hard disk; required for all known boot loaders
-                '-no-emul-boot'
-            )
-        fi
-
-        # Specify where to save the El Torito boot catalog file in case it is not already set by bios.syslinux.eltorito
-        [[ " ${bootmodes[*]} " =~ ' bios.' ]] || xorrisofs_options+=('-eltorito-catalog' 'EFI/boot.cat')
-    fi
+    # Add required xorrisofs options for each boot mode
+    for bootmode in "${bootmodes[@]}"; do
+        typeset -f "_add_xorrisofs_options_${bootmode}" &> /dev/null && "_add_xorrisofs_options_${bootmode}"
+    done
 
     _msg_info "Creating ISO image..."
     xorriso -as mkisofs \
-- 
cgit v1.2.3-70-g09d2


From 3160db0e9ec448e06838805ac5dc01b575741668 Mon Sep 17 00:00:00 2001
From: David Runge <dvzrv@archlinux.org>
Date: Wed, 18 Nov 2020 19:24:02 +0100
Subject: Fix evaluation bugs in mkarchiso

archiso/mkarchiso:
Guard the call to `_mksignature()` in `_prepare_airootfs_image()` by an if statement.
Using the `&&` logic leads to `_prepare_airootfs_image()` evaluating to false if `$gpg_key` is not set.

Add `_msg_info()` calls to `_set_override()` which prevent the function from evaluating to false if no override is
being done. Additionally this is great for debugging purposes.

Add `_msg_info()` calls to `_read_profile()` (which is great for debugging purposes).

Fixes #81
---
 archiso/mkarchiso | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

(limited to 'archiso/mkarchiso')

diff --git a/archiso/mkarchiso b/archiso/mkarchiso
index 02a165f..a3b1e53 100755
--- a/archiso/mkarchiso
+++ b/archiso/mkarchiso
@@ -643,7 +643,9 @@ _validate_requirements_bootmode_uefi-x64.systemd-boot.eltorito() {
 _prepare_airootfs_image() {
     _run_once "_mkairootfs_${airootfs_image_type}"
     _mkchecksum
-    [[ -n "${gpg_key}" ]] && _mksignature
+    if [[ -n "${gpg_key}" ]]; then
+        _mksignature
+    fi
 }
 
 _validate_requirements_airootfs_image_type_squashfs() {
@@ -779,6 +781,7 @@ _read_profile() {
     local validation_error=0
     local bootmode
 
+    _msg_info "Reading profile..."
     if [[ -z "${profile}" ]]; then
         _msg_error "No profile specified!" 1
     fi
@@ -844,16 +847,20 @@ _read_profile() {
             _msg_error "${validation_error} errors were encountered while validating the profile. Aborting." 1
         fi
     fi
+    _msg_info "Done!"
 }
 
 # set overrides from mkarchiso option parameters, if present
 _set_overrides() {
+    _msg_info "Setting overrides..."
     [[ -n "$override_iso_label" ]] && iso_label="$override_iso_label"
     [[ -n "$override_iso_publisher" ]] && iso_publisher="$override_iso_publisher"
     [[ -n "$override_iso_application" ]] && iso_application="$override_iso_application"
     [[ -n "$override_install_dir" ]] && install_dir="$override_install_dir"
     [[ -n "$override_pacman_conf" ]] && pacman_conf="$override_pacman_conf"
     [[ -n "$override_gpg_key" ]] && gpg_key="$override_gpg_key"
+    # NOTE: the call to _msg_info() conveniently guards this function from evaluating to false
+    _msg_info "Done!"
 }
 
 
-- 
cgit v1.2.3-70-g09d2


From 42d9e4f983e9dbafb94a6fc52df1b25973afb63a Mon Sep 17 00:00:00 2001
From: nl6720 <nl6720@gmail.com>
Date: Sat, 14 Nov 2020 11:43:13 +0200
Subject: Allow specifying ownership and mode of custom airootfs files and
 directories

profiledef.sh can now contain an associative array called file_permissions which can be used to set custom ownership and mode of custom airootfs files. The array's keys contain the path and the value is a colon separated list of owner UID, owner GID and access mode.
For example:

    file_permissions=(
      ["/etc/shadow"]="0:0:400"
    )

This means that mkarchiso now copies airootfs files (and directores) without permissions and anything that should be owned by a user other than root and/or if the mode should be something other than 644 for files and 755 for directories must to be listed in ${file_permission[@]} in profiledef.sh.

Fixes https://gitlab.archlinux.org/archlinux/archiso/-/issues/61 .
---
 README.profile.rst             |  8 ++++++--
 archiso/mkarchiso              | 41 +++++++++++++++++++----------------------
 configs/baseline/profiledef.sh |  3 +++
 configs/releng/profiledef.sh   |  8 ++++++++
 4 files changed, 36 insertions(+), 24 deletions(-)

(limited to 'archiso/mkarchiso')

diff --git a/README.profile.rst b/README.profile.rst
index fef34f9..1729319 100644
--- a/README.profile.rst
+++ b/README.profile.rst
@@ -52,6 +52,9 @@ The image file is constructed from some of the variables in **profiledef.sh**: `
   - `ext4+squashfs`: Create an ext4 partition, copy the airootfs work directory to it and create a squashfs image from it
 * `airootfs_image_tool_options`: An array of options to pass to the tool to create the airootfs image. Currently only
   `mksquashfs` is supported - see `mksquashfs --help` for all possible options (defaults to `('-comp' 'xz')`).
+  - `file_permissions`: An associative array that lists files and/or directories who need specific ownership or
+  permissions. The array's keys contain the path and the value is a colon separated list of owner UID, owner GID and
+  access mode. E.g. `file_permissions=(["/etc/shadow"]="0:0:400")`.
 
 packages.arch
 =============
@@ -91,8 +94,9 @@ airootfs
 This - optional - directory may contain files and directories that will be copied to the work directory of the resulting
 image's root filesystem.
 The files are copied before packages are being installed to work directory location.
-Ownership of files and directories from the profile's `airootfs` directory are not preserved (permissions are currently
-the same as in the profile's `airootfs` - see `#61 <https://gitlab.archlinux.org/archlinux/archiso/-/issues/73>`_).
+Ownership and permissions of files and directories from the profile's `airootfs` directory are not preserved. The mode
+will be `644` for files and `755` for directories, all of them will be owned by root. To set custom ownership and/or
+permissions, use `file_permissions` in **profiledef.sh**.
 
 With this overlay structure it is possible to e.g. create users and set passwords for them, by providing
 `airootfs/etc/passwd`, `airootfs/etc/shadow`, `airootfs/etc/gshadow` (see `man 5 passwd`, `man 5 shadow` and `man 5
diff --git a/archiso/mkarchiso b/archiso/mkarchiso
index a3b1e53..99c8114 100755
--- a/archiso/mkarchiso
+++ b/archiso/mkarchiso
@@ -37,6 +37,7 @@ override_pacman_conf=""
 bootmodes=()
 airootfs_image_type="squashfs"
 airootfs_image_tool_options=('-comp' 'xz')
+declare -A file_permissions=()
 
 
 # Show an INFO message
@@ -257,30 +258,23 @@ _make_pacman_conf() {
 # Prepare working directory and copy custom airootfs files (airootfs)
 _make_custom_airootfs() {
     local passwd=()
+    local filename permissions
 
     install -d -m 0755 -o 0 -g 0 -- "${airootfs_dir}"
 
     if [[ -d "${profile}/airootfs" ]]; then
-        _msg_info "Copying custom airootfs files and setting up user home directories..."
-        cp -af --no-preserve=ownership -- "${profile}/airootfs/." "${airootfs_dir}"
-
-        [[ -e "${airootfs_dir}/etc/shadow" ]] && chmod -f 0400 -- "${airootfs_dir}/etc/shadow"
-        [[ -e "${airootfs_dir}/etc/gshadow" ]] && chmod -f 0400 -- "${airootfs_dir}/etc/gshadow"
-
-        # Set up user home directories and permissions
-        if [[ -e "${airootfs_dir}/etc/passwd" ]]; then
-            while IFS=':' read -a passwd -r; do
-                [[ "${passwd[5]}" == '/' ]] && continue
-                [[ -z "${passwd[5]}" ]] && continue
-
-                if [[ -d "${airootfs_dir}${passwd[5]}" ]]; then
-                    chown -hR -- "${passwd[2]}:${passwd[3]}" "${airootfs_dir}${passwd[5]}"
-                    chmod -f 0750 -- "${airootfs_dir}${passwd[5]}"
-                else
-                    install -d -m 0750 -o "${passwd[2]}" -g "${passwd[3]}" -- "${airootfs_dir}${passwd[5]}"
-                fi
-             done < "${airootfs_dir}/etc/passwd"
-        fi
+        _msg_info "Copying custom airootfs files..."
+        cp -af --no-preserve=ownership,mode -- "${profile}/airootfs/." "${airootfs_dir}"
+        # Set ownership and mode for files and directories
+        for filename in "${!file_permissions[@]}"; do
+            IFS=':' read -ra permissions <<< "${file_permissions["${filename}"]}"
+            if [[ -e "${airootfs_dir}${filename}" ]]; then
+                chown -fh -- "${permissions[0]}:${permissions[1]}" "${airootfs_dir}${filename}"
+                chmod -f -- "${permissions[2]}" "${airootfs_dir}${filename}"
+            else
+                _msg_warning "Cannot change permissions of '${airootfs_dir}${filename}'. The file or directory does not exist."
+            fi
+        done
         _msg_info "Done!"
     fi
 }
@@ -318,10 +312,12 @@ _make_customize_airootfs() {
             (( passwd[2] >= 1000 && passwd[2] < 60000 )) || continue
             [[ "${passwd[5]}" == '/' ]] && continue
             [[ -z "${passwd[5]}" ]] && continue
-            cp -dnRT --preserve=mode,timestamps,links -- "${airootfs_dir}/etc/skel" "${airootfs_dir}${passwd[5]}"
+            if [[ ! -d "${airootfs_dir}${passwd[5]}" ]]; then
+                install -d -m 0750 -o "${passwd[2]}" -g "${passwd[3]}" -- "${airootfs_dir}${passwd[5]}"
+            fi
+            cp -dnRT --preserve=mode,timestamps,links -- "${airootfs_dir}/etc/skel/." "${airootfs_dir}${passwd[5]}"
             chmod -f 0750 -- "${airootfs_dir}${passwd[5]}"
             chown -hR -- "${passwd[2]}:${passwd[3]}" "${airootfs_dir}${passwd[5]}"
-
         done < "${profile}/airootfs/etc/passwd"
         _msg_info "Done!"
     fi
@@ -329,6 +325,7 @@ _make_customize_airootfs() {
     if [[ -e "${airootfs_dir}/root/customize_airootfs.sh" ]]; then
         _msg_info "Running customize_airootfs.sh in '${airootfs_dir}' chroot..."
         _msg_warning "customize_airootfs.sh is deprecated! Support for it will be removed in a future archiso version."
+        chmod -f -- +x "${airootfs_dir}/root/customize_airootfs.sh"
         eval -- arch-chroot "${airootfs_dir}" "/root/customize_airootfs.sh"
         rm -- "${airootfs_dir}/root/customize_airootfs.sh"
         _msg_info "Done! customize_airootfs.sh run successfully."
diff --git a/configs/baseline/profiledef.sh b/configs/baseline/profiledef.sh
index 2efd38f..8705529 100644
--- a/configs/baseline/profiledef.sh
+++ b/configs/baseline/profiledef.sh
@@ -10,3 +10,6 @@ install_dir="arch"
 bootmodes=('bios.syslinux.mbr' 'bios.syslinux.eltorito' 'uefi-x64.systemd-boot.esp' 'uefi-x64.systemd-boot.eltorito')
 arch="x86_64"
 pacman_conf="pacman.conf"
+file_permissions=(
+  ["/etc/shadow"]="0:0:400"
+)
diff --git a/configs/releng/profiledef.sh b/configs/releng/profiledef.sh
index 2e74e5f..051a390 100644
--- a/configs/releng/profiledef.sh
+++ b/configs/releng/profiledef.sh
@@ -11,3 +11,11 @@ bootmodes=('bios.syslinux.mbr' 'bios.syslinux.eltorito' 'uefi-x64.systemd-boot.e
 arch="x86_64"
 pacman_conf="pacman.conf"
 airootfs_image_tool_options=('-comp' 'xz' '-Xbcj' 'x86' '-b' '1M' '-Xdict-size' '1M')
+file_permissions=(
+  ["/etc/shadow"]="0:0:400"
+  ["/root"]="0:0:750"
+  ["/root/.automated_script.sh"]="0:0:750"
+  ["/usr/local/bin/choose-mirror"]="0:0:755"
+  ["/usr/local/bin/Installation_guide"]="0:0:755"
+  ["/usr/local/bin/livecd-sound"]="0:0:755"
+)
-- 
cgit v1.2.3-70-g09d2


From 183ae5279252cebca0aac5de328566e3e31b09c2 Mon Sep 17 00:00:00 2001
From: nl6720 <nl6720@gmail.com>
Date: Mon, 30 Nov 2020 09:19:05 +0200
Subject: Prevent path traversal outside of $airootfs_dir

---
 archiso/mkarchiso | 29 ++++++++++++++++++++---------
 1 file changed, 20 insertions(+), 9 deletions(-)

(limited to 'archiso/mkarchiso')

diff --git a/archiso/mkarchiso b/archiso/mkarchiso
index 99c8114..645dd83 100755
--- a/archiso/mkarchiso
+++ b/archiso/mkarchiso
@@ -268,11 +268,15 @@ _make_custom_airootfs() {
         # Set ownership and mode for files and directories
         for filename in "${!file_permissions[@]}"; do
             IFS=':' read -ra permissions <<< "${file_permissions["${filename}"]}"
-            if [[ -e "${airootfs_dir}${filename}" ]]; then
-                chown -fh -- "${permissions[0]}:${permissions[1]}" "${airootfs_dir}${filename}"
-                chmod -f -- "${permissions[2]}" "${airootfs_dir}${filename}"
-            else
+            # Prevent file path traversal outside of $airootfs_dir
+            if [[ "$(realpath -q -- "${airootfs_dir}${filename}")" != "${airootfs_dir}"* ]]; then
+                _msg_error "Failed to set permissions on '${airootfs_dir}${filename}'. Outside of valid path." 1
+            # Warn if the file does not exist
+            elif [[ ! -e "${airootfs_dir}${filename}" ]]; then
                 _msg_warning "Cannot change permissions of '${airootfs_dir}${filename}'. The file or directory does not exist."
+            else
+                echo chown -fh -- "${permissions[0]}:${permissions[1]}" "${airootfs_dir}${filename}"
+                echo chmod -f -- "${permissions[2]}" "${airootfs_dir}${filename}"
             fi
         done
         _msg_info "Done!"
@@ -309,15 +313,22 @@ _make_customize_airootfs() {
     if [[ -e "${profile}/airootfs/etc/passwd" ]]; then
         _msg_info "Copying /etc/skel/* to user homes..."
         while IFS=':' read -a passwd -r; do
+            # Only operate on UIDs in range 1000–59999
             (( passwd[2] >= 1000 && passwd[2] < 60000 )) || continue
+            # Skip invalid home directories
             [[ "${passwd[5]}" == '/' ]] && continue
             [[ -z "${passwd[5]}" ]] && continue
-            if [[ ! -d "${airootfs_dir}${passwd[5]}" ]]; then
-                install -d -m 0750 -o "${passwd[2]}" -g "${passwd[3]}" -- "${airootfs_dir}${passwd[5]}"
+            # Prevent path traversal outside of $airootfs_dir
+            if [[ "$(realpath -q -- "${airootfs_dir}${passwd[5]}")" == "${airootfs_dir}"* ]]; then
+                if [[ ! -d "${airootfs_dir}${passwd[5]}" ]]; then
+                    install -d -m 0750 -o "${passwd[2]}" -g "${passwd[3]}" -- "${airootfs_dir}${passwd[5]}"
+                fi
+                cp -dnRT --preserve=mode,timestamps,links -- "${airootfs_dir}/etc/skel/." "${airootfs_dir}${passwd[5]}"
+                chmod -f 0750 -- "${airootfs_dir}${passwd[5]}"
+                chown -hR -- "${passwd[2]}:${passwd[3]}" "${airootfs_dir}${passwd[5]}"
+            else
+                _msg_error "Failed to set permissions on '${airootfs_dir}${passwd[5]}'. Outside of valid path." 1
             fi
-            cp -dnRT --preserve=mode,timestamps,links -- "${airootfs_dir}/etc/skel/." "${airootfs_dir}${passwd[5]}"
-            chmod -f 0750 -- "${airootfs_dir}${passwd[5]}"
-            chown -hR -- "${passwd[2]}:${passwd[3]}" "${airootfs_dir}${passwd[5]}"
         done < "${profile}/airootfs/etc/passwd"
         _msg_info "Done!"
     fi
-- 
cgit v1.2.3-70-g09d2


From 863247d0a6980906dad0308044f2f3b6ceccc110 Mon Sep 17 00:00:00 2001
From: nl6720 <nl6720@gmail.com>
Date: Tue, 17 Nov 2020 14:10:21 +0200
Subject: Keep all SYSLINUX files in /syslinux

This gets rid of the duplicate ldlinux.c32 and the useless isolinux.cfg which only points to syslinux.cfg.

Implements https://gitlab.archlinux.org/archlinux/archiso/-/issues/46 .
---
 README.profile.rst                            | 13 +----
 archiso/mkarchiso                             | 76 ++++++++-------------------
 configs/baseline/isolinux/isolinux.cfg        |  9 ----
 configs/baseline/syslinux/syslinux-linux.cfg  |  4 +-
 configs/baseline/syslinux/syslinux.cfg        |  4 +-
 configs/releng/isolinux/isolinux.cfg          |  9 ----
 configs/releng/syslinux/archiso.cfg           | 14 -----
 configs/releng/syslinux/archiso_head.cfg      |  4 +-
 configs/releng/syslinux/archiso_pxe-linux.cfg | 12 ++---
 configs/releng/syslinux/archiso_pxe.cfg       |  6 +--
 configs/releng/syslinux/archiso_sys-linux.cfg |  8 +--
 configs/releng/syslinux/archiso_sys.cfg       |  6 +--
 configs/releng/syslinux/archiso_tail.cfg      | 12 ++---
 configs/releng/syslinux/syslinux.cfg          | 17 ++++--
 14 files changed, 64 insertions(+), 130 deletions(-)
 delete mode 100644 configs/baseline/isolinux/isolinux.cfg
 delete mode 100644 configs/releng/isolinux/isolinux.cfg
 delete mode 100644 configs/releng/syslinux/archiso.cfg

(limited to 'archiso/mkarchiso')

diff --git a/README.profile.rst b/README.profile.rst
index 1729319..6541bd7 100644
--- a/README.profile.rst
+++ b/README.profile.rst
@@ -9,7 +9,6 @@ An archiso profile consists of several configuration files and a directory for f
     profile
     |- airootfs/
     |- efiboot/
-    |- isolinux/
     |- syslinux/
     |- packages.arch
     |- pacman.conf
@@ -133,21 +132,13 @@ selected in **profiledef.sh**. It contains configuration for `systemd-boot
 The *custom template identifiers* are **only** understood in the boot loader entry `.conf` files (i.e. **not** in
 `loader.conf`).
 
-isolinux
---------
-
-This directory is mandatory when the `bios.syslinux.eltorito` bootmode is selected in **profiledef.sh**.
-It contains configuration for `isolinux <https://wiki.syslinux.org/wiki/index.php?title=ISOLINUX>`_ used in the resuling
-image.
-
-The *custom template identifiers* are understood in all `.cfg` files in this directory.
-
 syslinux
 --------
 
 This directory is mandatory when the `bios.syslinux.mbr` or the `bios.syslinux.eltorito` bootmodes are selected in
 **profiledef.sh**.
-It contains configuration files for `syslinux <https://wiki.syslinux.org/wiki/index.php?title=SYSLINUX>`_ or `pxelinux
+It contains configuration files for `syslinux <https://wiki.syslinux.org/wiki/index.php?title=SYSLINUX>`_ or `isolinux
+<https://wiki.syslinux.org/wiki/index.php?title=ISOLINUX>`_ , or `pxelinux
 <https://wiki.syslinux.org/wiki/index.php?title=PXELINUX>`_ used in the resuling image.
 
 The *custom template identifiers* are understood in all `.cfg` files in this directory.
diff --git a/archiso/mkarchiso b/archiso/mkarchiso
index 645dd83..0e478a4 100755
--- a/archiso/mkarchiso
+++ b/archiso/mkarchiso
@@ -372,33 +372,33 @@ _make_boot_on_iso9660() {
     _msg_info "Done!"
 }
 
-# Prepare /${install_dir}/boot/syslinux
+# Prepare /syslinux for booting from MBR
 _make_bootmode_bios.syslinux.mbr() {
     _msg_info "Setting up SYSLINUX for BIOS booting from a disk..."
-    install -d -m 0755 -- "${isofs_dir}/${install_dir}/boot/syslinux"
+    install -d -m 0755 -- "${isofs_dir}/syslinux"
     for _cfg in "${profile}/syslinux/"*.cfg; do
         sed "s|%ARCHISO_LABEL%|${iso_label}|g;
              s|%INSTALL_DIR%|${install_dir}|g;
              s|%ARCH%|${arch}|g" \
-             "${_cfg}" > "${isofs_dir}/${install_dir}/boot/syslinux/${_cfg##*/}"
+             "${_cfg}" > "${isofs_dir}/syslinux/${_cfg##*/}"
     done
     if [[ -e "${profile}/syslinux/splash.png" ]]; then
-        install -m 0644 -- "${profile}/syslinux/splash.png" "${isofs_dir}/${install_dir}/boot/syslinux/"
+        install -m 0644 -- "${profile}/syslinux/splash.png" "${isofs_dir}/syslinux/"
     fi
-    install -m 0644 -- "${airootfs_dir}/usr/lib/syslinux/bios/"*.c32 "${isofs_dir}/${install_dir}/boot/syslinux/"
-    install -m 0644 -- "${airootfs_dir}/usr/lib/syslinux/bios/lpxelinux.0" "${isofs_dir}/${install_dir}/boot/syslinux/"
-    install -m 0644 -- "${airootfs_dir}/usr/lib/syslinux/bios/memdisk" "${isofs_dir}/${install_dir}/boot/syslinux/"
+    install -m 0644 -- "${airootfs_dir}/usr/lib/syslinux/bios/"*.c32 "${isofs_dir}/syslinux/"
+    install -m 0644 -- "${airootfs_dir}/usr/lib/syslinux/bios/lpxelinux.0" "${isofs_dir}/syslinux/"
+    install -m 0644 -- "${airootfs_dir}/usr/lib/syslinux/bios/memdisk" "${isofs_dir}/syslinux/"
 
     _run_once _make_boot_on_iso9660
 
-    if [[ -e "${isofs_dir}/${install_dir}/boot/syslinux/hdt.c32" ]]; then
-        install -d -m 0755 -- "${isofs_dir}/${install_dir}/boot/syslinux/hdt"
+    if [[ -e "${isofs_dir}/syslinux/hdt.c32" ]]; then
+        install -d -m 0755 -- "${isofs_dir}/syslinux/hdt"
         if [[ -e "${airootfs_dir}/usr/share/hwdata/pci.ids" ]]; then
             gzip -c -9 "${airootfs_dir}/usr/share/hwdata/pci.ids" > \
-                "${isofs_dir}/${install_dir}/boot/syslinux/hdt/pciids.gz"
+                "${isofs_dir}/syslinux/hdt/pciids.gz"
         fi
         find "${airootfs_dir}/usr/lib/modules" -name 'modules.alias' -print -exec gzip -c -9 '{}' ';' -quit > \
-            "${isofs_dir}/${install_dir}/boot/syslinux/hdt/modalias.gz"
+            "${isofs_dir}/syslinux/hdt/modalias.gz"
     fi
 
     # Add other aditional/extra files to ${install_dir}/boot/
@@ -412,21 +412,14 @@ _make_bootmode_bios.syslinux.mbr() {
     _msg_info "Done! SYSLINUX set up for BIOS booting from a disk successfully."
 }
 
-# Prepare /isolinux
+# Prepare /syslinux for El-Torito booting
 _make_bootmode_bios.syslinux.eltorito() {
     _msg_info "Setting up SYSLINUX for BIOS booting from an optical disc..."
-    install -d -m 0755 -- "${isofs_dir}/isolinux"
-    for _cfg in "${profile}/isolinux/"*".cfg"; do
-        sed "s|%ARCHISO_LABEL%|${iso_label}|g;
-             s|%INSTALL_DIR%|${install_dir}|g;
-             s|%ARCH%|${arch}|g" \
-             "${_cfg}" > "${isofs_dir}/isolinux/${_cfg##*/}"
-    done
-    install -m 0644 -- "${airootfs_dir}/usr/lib/syslinux/bios/isolinux.bin" "${isofs_dir}/isolinux/"
-    install -m 0644 -- "${airootfs_dir}/usr/lib/syslinux/bios/isohdpfx.bin" "${isofs_dir}/isolinux/"
-    install -m 0644 -- "${airootfs_dir}/usr/lib/syslinux/bios/ldlinux.c32" "${isofs_dir}/isolinux/"
+    install -d -m 0755 -- "${isofs_dir}/syslinux"
+    install -m 0644 -- "${airootfs_dir}/usr/lib/syslinux/bios/isolinux.bin" "${isofs_dir}/syslinux/"
+    install -m 0644 -- "${airootfs_dir}/usr/lib/syslinux/bios/isohdpfx.bin" "${isofs_dir}/syslinux/"
 
-    # isolinux.cfg loads syslinux.cfg
+    # ISOLINUX and SYSLINUX installation is shared
     _run_once _make_bootmode_bios.syslinux.mbr
 
     _msg_info "Done! SYSLINUX set up for BIOS booting from an optical disc successfully."
@@ -573,34 +566,7 @@ _validate_requirements_bootmode_bios.syslinux.mbr() {
 }
 
 _validate_requirements_bootmode_bios.syslinux.eltorito() {
-    # Check if the syslinux package is in the package list
-    # shellcheck disable=SC2076
-    if [[ ! " ${pkg_list[*]} " =~ ' syslinux ' ]]; then
-        (( validation_error=validation_error+1 ))
-        _msg_error "Validating '${bootmode}': The 'syslinux' package is missing from the package list!" 0
-    fi
-
-    # Check if isolinux configuration files exist
-    if [[ ! -d "${profile}/isolinux" ]]; then
-        (( validation_error=validation_error+1 ))
-        _msg_error "Validating '${bootmode}': The '${profile}/isolinux' directory is missing!" 0
-    else
-        local cfgfile
-        for cfgfile in "${profile}/isolinux/"*'.cfg'; do
-            if [[ -e "${cfgfile}" ]]; then
-                break
-            else
-                (( validation_error=validation_error+1 ))
-                _msg_error "Validating '${bootmode}': No configuration file found in '${profile}/isolinux/'!" 0
-            fi
-        done
-    fi
-
-    # Check for optional packages
-    # shellcheck disable=SC2076
-    if [[ ! " ${pkg_list[*]} " =~ ' memtest86+ ' ]]; then
-        _msg_info "Validating '${bootmode}': 'memtest86+' is not in the package list. Memory testing will not be available from syslinux."
-    fi
+    _validate_requirements_bootmode_bios.syslinux.mbr
 }
 
 _validate_requirements_bootmode_uefi-x64.systemd-boot.esp() {
@@ -675,9 +641,9 @@ _validate_requirements_airootfs_image_type_ext4+squashfs() {
 _add_xorrisofs_options_bios.syslinux.eltorito() {
     xorrisofs_options+=(
         # El Torito boot image for x86 BIOS
-        '-eltorito-boot' 'isolinux/isolinux.bin'
+        '-eltorito-boot' 'syslinux/isolinux.bin'
         # El Torito boot catalog file
-        '-eltorito-catalog' 'isolinux/boot.cat'
+        '-eltorito-catalog' 'syslinux/boot.cat'
         # Required options to boot with ISOLINUX
         '-no-emul-boot' '-boot-load-size' '4' '-boot-info-table'
     )
@@ -686,8 +652,8 @@ _add_xorrisofs_options_bios.syslinux.eltorito() {
 # SYSLINUX MBR
 _add_xorrisofs_options_bios.syslinux.mbr() {
     xorrisofs_options+=(
-        # SYSLINUX MBR bootstrap code; does not work without "-eltorito-boot isolinux/isolinux.bin"
-        '-isohybrid-mbr' "${isofs_dir}/isolinux/isohdpfx.bin"
+        # SYSLINUX MBR bootstrap code; does not work without "-eltorito-boot syslinux/isolinux.bin"
+        '-isohybrid-mbr' "${isofs_dir}/syslinux/isohdpfx.bin"
         # When GPT is used, create an additional partition in the MBR (besides 0xEE) for sectors 0–1 (MBR
         # bootstrap code area) and mark it as bootable
         # This violates the UEFI specification, but may allow booting on some systems
diff --git a/configs/baseline/isolinux/isolinux.cfg b/configs/baseline/isolinux/isolinux.cfg
deleted file mode 100644
index e078ce3..0000000
--- a/configs/baseline/isolinux/isolinux.cfg
+++ /dev/null
@@ -1,9 +0,0 @@
-#
-# SPDX-License-Identifier: GPL-3.0-or-later
-
-PATH /%INSTALL_DIR%/boot/syslinux/
-DEFAULT loadconfig
-
-LABEL loadconfig
-  CONFIG /%INSTALL_DIR%/boot/syslinux/syslinux.cfg
-  APPEND /%INSTALL_DIR%/
diff --git a/configs/baseline/syslinux/syslinux-linux.cfg b/configs/baseline/syslinux/syslinux-linux.cfg
index 21dfbd7..867d815 100644
--- a/configs/baseline/syslinux/syslinux-linux.cfg
+++ b/configs/baseline/syslinux/syslinux-linux.cfg
@@ -3,6 +3,6 @@
 
 LABEL arch
 MENU LABEL Arch Linux (x86_64, BIOS)
-LINUX boot/%ARCH%/vmlinuz-linux
-INITRD boot/%ARCH%/initramfs-linux.img
+LINUX /%INSTALL_DIR%/boot/%ARCH%/vmlinuz-linux
+INITRD /%INSTALL_DIR%/boot/%ARCH%/initramfs-linux.img
 APPEND archisobasedir=%INSTALL_DIR% archisolabel=%ARCHISO_LABEL%
diff --git a/configs/baseline/syslinux/syslinux.cfg b/configs/baseline/syslinux/syslinux.cfg
index c021a0e..88a36ea 100644
--- a/configs/baseline/syslinux/syslinux.cfg
+++ b/configs/baseline/syslinux/syslinux.cfg
@@ -1,11 +1,11 @@
 #
 # SPDX-License-Identifier: GPL-3.0-or-later
 
-UI boot/syslinux/menu.c32
+UI menu.c32
 MENU TITLE Arch Linux
 MENU CLEAR
 
 DEFAULT arch
 TIMEOUT 30
 
-INCLUDE boot/syslinux/syslinux-linux.cfg
+INCLUDE syslinux-linux.cfg
diff --git a/configs/releng/isolinux/isolinux.cfg b/configs/releng/isolinux/isolinux.cfg
deleted file mode 100644
index 7b14d59..0000000
--- a/configs/releng/isolinux/isolinux.cfg
+++ /dev/null
@@ -1,9 +0,0 @@
-#
-# SPDX-License-Identifier: GPL-3.0-or-later
-
-PATH /%INSTALL_DIR%/boot/syslinux/
-DEFAULT loadconfig
-
-LABEL loadconfig
-  CONFIG /%INSTALL_DIR%/boot/syslinux/archiso.cfg
-  APPEND /%INSTALL_DIR%/
diff --git a/configs/releng/syslinux/archiso.cfg b/configs/releng/syslinux/archiso.cfg
deleted file mode 100644
index a6ba8b0..0000000
--- a/configs/releng/syslinux/archiso.cfg
+++ /dev/null
@@ -1,14 +0,0 @@
-#
-# SPDX-License-Identifier: GPL-3.0-or-later
-
-DEFAULT select
-
-LABEL select
-COM32 boot/syslinux/whichsys.c32
-APPEND -pxe- pxe -sys- sys -iso- sys
-
-LABEL pxe
-CONFIG boot/syslinux/archiso_pxe.cfg
-
-LABEL sys
-CONFIG boot/syslinux/archiso_sys.cfg
diff --git a/configs/releng/syslinux/archiso_head.cfg b/configs/releng/syslinux/archiso_head.cfg
index be08525..e553e79 100644
--- a/configs/releng/syslinux/archiso_head.cfg
+++ b/configs/releng/syslinux/archiso_head.cfg
@@ -2,9 +2,9 @@
 # SPDX-License-Identifier: GPL-3.0-or-later
 
 SERIAL 0 38400
-UI boot/syslinux/vesamenu.c32
+UI vesamenu.c32
 MENU TITLE Arch Linux
-MENU BACKGROUND boot/syslinux/splash.png
+MENU BACKGROUND splash.png
 
 MENU WIDTH 78
 MENU MARGIN 4
diff --git a/configs/releng/syslinux/archiso_pxe-linux.cfg b/configs/releng/syslinux/archiso_pxe-linux.cfg
index aa4bc2a..c991ca0 100644
--- a/configs/releng/syslinux/archiso_pxe-linux.cfg
+++ b/configs/releng/syslinux/archiso_pxe-linux.cfg
@@ -7,8 +7,8 @@ Boot the Arch Linux install medium using NBD.
 It allows you to install Arch Linux or perform system maintenance.
 ENDTEXT
 MENU LABEL Arch Linux install medium (x86_64, NBD)
-LINUX boot/x86_64/vmlinuz-linux
-INITRD boot/intel-ucode.img,boot/amd-ucode.img,boot/x86_64/initramfs-linux.img
+LINUX /%INSTALL_DIR%/boot/x86_64/vmlinuz-linux
+INITRD /%INSTALL_DIR%/boot/intel-ucode.img,/%INSTALL_DIR%/boot/amd-ucode.img,/%INSTALL_DIR%/boot/x86_64/initramfs-linux.img
 APPEND archisobasedir=%INSTALL_DIR% archisolabel=%ARCHISO_LABEL% archiso_nbd_srv=${pxeserver} checksum verify
 SYSAPPEND 3
 
@@ -18,8 +18,8 @@ Boot the Arch Linux live medium using NFS.
 It allows you to install Arch Linux or perform system maintenance.
 ENDTEXT
 MENU LABEL Arch Linux install medium (x86_64, NFS)
-LINUX boot/x86_64/vmlinuz-linux
-INITRD boot/intel-ucode.img,boot/amd-ucode.img,boot/x86_64/initramfs-linux.img
+LINUX /%INSTALL_DIR%/boot/x86_64/vmlinuz-linux
+INITRD /%INSTALL_DIR%/boot/intel-ucode.img,/%INSTALL_DIR%/amd-ucode.img,/%INSTALL_DIR%/boot/x86_64/initramfs-linux.img
 APPEND archisobasedir=%INSTALL_DIR% archiso_nfs_srv=${pxeserver}:/run/archiso/bootmnt checksum verify
 SYSAPPEND 3
 
@@ -29,7 +29,7 @@ Boot the Arch Linux live medium using HTTP.
 It allows you to install Arch Linux or perform system maintenance.
 ENDTEXT
 MENU LABEL Arch Linux install medium (x86_64, HTTP)
-LINUX boot/x86_64/vmlinuz-linux
-INITRD boot/intel-ucode.img,boot/amd-ucode.img,boot/x86_64/initramfs-linux.img
+LINUX /%INSTALL_DIR%/boot/x86_64/vmlinuz-linux
+INITRD /%INSTALL_DIR%/boot/intel-ucode.img,/%INSTALL_DIR%/boot/amd-ucode.img,/%INSTALL_DIR%/boot/x86_64/initramfs-linux.img
 APPEND archisobasedir=%INSTALL_DIR% archiso_http_srv=http://${pxeserver}/ checksum verify
 SYSAPPEND 3
diff --git a/configs/releng/syslinux/archiso_pxe.cfg b/configs/releng/syslinux/archiso_pxe.cfg
index 202ed7a..b005cb1 100644
--- a/configs/releng/syslinux/archiso_pxe.cfg
+++ b/configs/releng/syslinux/archiso_pxe.cfg
@@ -1,8 +1,8 @@
 #
 # SPDX-License-Identifier: GPL-3.0-or-later
 
-INCLUDE boot/syslinux/archiso_head.cfg
+INCLUDE archiso_head.cfg
 
-INCLUDE boot/syslinux/archiso_pxe-linux.cfg
+INCLUDE archiso_pxe-linux.cfg
 
-INCLUDE boot/syslinux/archiso_tail.cfg
+INCLUDE archiso_tail.cfg
diff --git a/configs/releng/syslinux/archiso_sys-linux.cfg b/configs/releng/syslinux/archiso_sys-linux.cfg
index d5fd776..e2b4edd 100644
--- a/configs/releng/syslinux/archiso_sys-linux.cfg
+++ b/configs/releng/syslinux/archiso_sys-linux.cfg
@@ -7,8 +7,8 @@ Boot the Arch Linux install medium on BIOS.
 It allows you to install Arch Linux or perform system maintenance.
 ENDTEXT
 MENU LABEL Arch Linux install medium (x86_64, BIOS)
-LINUX boot/x86_64/vmlinuz-linux
-INITRD boot/intel-ucode.img,boot/amd-ucode.img,boot/x86_64/initramfs-linux.img
+LINUX /%INSTALL_DIR%/boot/x86_64/vmlinuz-linux
+INITRD /%INSTALL_DIR%/boot/intel-ucode.img,/%INSTALL_DIR%/boot/amd-ucode.img,/%INSTALL_DIR%/boot/x86_64/initramfs-linux.img
 APPEND archisobasedir=%INSTALL_DIR% archisolabel=%ARCHISO_LABEL%
 
 # Accessibility boot option
@@ -18,6 +18,6 @@ Boot the Arch Linux install medium on BIOS with speakup screen reader.
 It allows you to install Arch Linux or perform system maintenance with speech feedback.
 ENDTEXT
 MENU LABEL Arch Linux install medium (x86_64, BIOS) with ^speech
-LINUX boot/x86_64/vmlinuz-linux
-INITRD boot/intel-ucode.img,boot/amd-ucode.img,boot/x86_64/initramfs-linux.img
+LINUX /%INSTALL_DIR%/boot/x86_64/vmlinuz-linux
+INITRD /%INSTALL_DIR%/boot/intel-ucode.img,/%INSTALL_DIR%/boot/amd-ucode.img,/%INSTALL_DIR%/boot/x86_64/initramfs-linux.img
 APPEND archisobasedir=%INSTALL_DIR% archisolabel=%ARCHISO_LABEL% accessibility=on
diff --git a/configs/releng/syslinux/archiso_sys.cfg b/configs/releng/syslinux/archiso_sys.cfg
index 9e70c17..cab78f8 100644
--- a/configs/releng/syslinux/archiso_sys.cfg
+++ b/configs/releng/syslinux/archiso_sys.cfg
@@ -1,11 +1,11 @@
 #
 # SPDX-License-Identifier: GPL-3.0-or-later
 
-INCLUDE boot/syslinux/archiso_head.cfg
+INCLUDE archiso_head.cfg
 
 DEFAULT arch64
 TIMEOUT 150
 
-INCLUDE boot/syslinux/archiso_sys-linux.cfg
+INCLUDE archiso_sys-linux.cfg
 
-INCLUDE boot/syslinux/archiso_tail.cfg
+INCLUDE archiso_tail.cfg
diff --git a/configs/releng/syslinux/archiso_tail.cfg b/configs/releng/syslinux/archiso_tail.cfg
index 685e1c8..af172c0 100644
--- a/configs/releng/syslinux/archiso_tail.cfg
+++ b/configs/releng/syslinux/archiso_tail.cfg
@@ -7,19 +7,19 @@ Boot an existing operating system.
 Press TAB to edit the disk and partition number to boot.
 ENDTEXT
 MENU LABEL Boot existing OS
-COM32 boot/syslinux/chain.c32
+COM32 chain.c32
 APPEND hd0 0
 
 # http://www.memtest.org/
 LABEL memtest
 MENU LABEL Run Memtest86+ (RAM test)
-LINUX boot/memtest
+LINUX /%INSTALL_DIR%/boot/memtest
 
 # http://hdt-project.org/
 LABEL hdt
 MENU LABEL Hardware Information (HDT)
-COM32 boot/syslinux/hdt.c32
-APPEND modules_alias=boot/syslinux/hdt/modalias.gz pciids=boot/syslinux/hdt/pciids.gz
+COM32 hdt.c32
+APPEND modules_alias=hdt/modalias.gz pciids=hdt/pciids.gz
 
 LABEL reboot
 TEXT HELP
@@ -27,7 +27,7 @@ Reboot computer.
 The computer's firmware must support APM.
 ENDTEXT
 MENU LABEL Reboot
-COM32 boot/syslinux/reboot.c32
+COM32 reboot.c32
 
 LABEL poweroff
 TEXT HELP
@@ -35,4 +35,4 @@ Power off computer.
 The computer's firmware must support APM.
 ENDTEXT
 MENU LABEL Power Off
-COM32 boot/syslinux/poweroff.c32
+COM32 poweroff.c32
diff --git a/configs/releng/syslinux/syslinux.cfg b/configs/releng/syslinux/syslinux.cfg
index 3ee98de..847ab6b 100644
--- a/configs/releng/syslinux/syslinux.cfg
+++ b/configs/releng/syslinux/syslinux.cfg
@@ -1,5 +1,14 @@
-DEFAULT loadconfig
+#
+# SPDX-License-Identifier: GPL-3.0-or-later
 
-LABEL loadconfig
-  CONFIG archiso.cfg
-  APPEND ../../
+DEFAULT select
+
+LABEL select
+COM32 whichsys.c32
+APPEND -pxe- pxe -sys- sys -iso- sys
+
+LABEL pxe
+CONFIG archiso_pxe.cfg
+
+LABEL sys
+CONFIG archiso_sys.cfg
-- 
cgit v1.2.3-70-g09d2


From c10004dfecaea195b77fd883224023cc8f2eaaaf Mon Sep 17 00:00:00 2001
From: David Runge <dvzrv@archlinux.org>
Date: Mon, 30 Nov 2020 21:48:08 +0100
Subject: Fix issues with file ownerships/modes

archiso/mkarchiso:
Make sure to always compare absolute paths in `_make_custom_airootfs()` (as `realpath` is used).
Remove `echo` calls that prevent the setting of actual file ownerships and modes.

configs/releng/profiledef.sh:
Set file mode of /root/.automated_script.sh to 755.

Fixes #82
---
 archiso/mkarchiso            | 6 +++---
 configs/releng/profiledef.sh | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'archiso/mkarchiso')

diff --git a/archiso/mkarchiso b/archiso/mkarchiso
index 0e478a4..4ab6bed 100755
--- a/archiso/mkarchiso
+++ b/archiso/mkarchiso
@@ -269,14 +269,14 @@ _make_custom_airootfs() {
         for filename in "${!file_permissions[@]}"; do
             IFS=':' read -ra permissions <<< "${file_permissions["${filename}"]}"
             # Prevent file path traversal outside of $airootfs_dir
-            if [[ "$(realpath -q -- "${airootfs_dir}${filename}")" != "${airootfs_dir}"* ]]; then
+            if [[ "$(realpath -q -- "${airootfs_dir}${filename}")" != "$(realpath -q -- "${airootfs_dir}")"* ]]; then
                 _msg_error "Failed to set permissions on '${airootfs_dir}${filename}'. Outside of valid path." 1
             # Warn if the file does not exist
             elif [[ ! -e "${airootfs_dir}${filename}" ]]; then
                 _msg_warning "Cannot change permissions of '${airootfs_dir}${filename}'. The file or directory does not exist."
             else
-                echo chown -fh -- "${permissions[0]}:${permissions[1]}" "${airootfs_dir}${filename}"
-                echo chmod -f -- "${permissions[2]}" "${airootfs_dir}${filename}"
+                chown -fh -- "${permissions[0]}:${permissions[1]}" "${airootfs_dir}${filename}"
+                chmod -f -- "${permissions[2]}" "${airootfs_dir}${filename}"
             fi
         done
         _msg_info "Done!"
diff --git a/configs/releng/profiledef.sh b/configs/releng/profiledef.sh
index 051a390..d046c9c 100644
--- a/configs/releng/profiledef.sh
+++ b/configs/releng/profiledef.sh
@@ -14,7 +14,7 @@ airootfs_image_tool_options=('-comp' 'xz' '-Xbcj' 'x86' '-b' '1M' '-Xdict-size'
 file_permissions=(
   ["/etc/shadow"]="0:0:400"
   ["/root"]="0:0:750"
-  ["/root/.automated_script.sh"]="0:0:750"
+  ["/root/.automated_script.sh"]="0:0:755"
   ["/usr/local/bin/choose-mirror"]="0:0:755"
   ["/usr/local/bin/Installation_guide"]="0:0:755"
   ["/usr/local/bin/livecd-sound"]="0:0:755"
-- 
cgit v1.2.3-70-g09d2


From 64091a1802a292e53d7dbb77f8198b550fc3cd35 Mon Sep 17 00:00:00 2001
From: nl6720 <nl6720@gmail.com>
Date: Sat, 5 Dec 2020 12:01:07 +0200
Subject: Combine sed commands to reduce file writes

---
 archiso/mkarchiso | 13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)

(limited to 'archiso/mkarchiso')

diff --git a/archiso/mkarchiso b/archiso/mkarchiso
index 4ab6bed..a75fc2a 100755
--- a/archiso/mkarchiso
+++ b/archiso/mkarchiso
@@ -242,17 +242,14 @@ _make_pacman_conf() {
     fi
 
     _msg_info "Copying custom pacman.conf to work directory..."
-    # take the profile pacman.conf and strip all settings that would break in chroot when using pacman -r
-    # see `man 8 pacman` for further info
-    pacman-conf --config "${pacman_conf}" | \
-        sed '/CacheDir/d;/DBPath/d;/HookDir/d;/LogFile/d;/RootDir/d' > "${work_dir}/pacman.conf"
-
     _msg_info "Using pacman CacheDir: ${_cache_dirs}"
+    # take the profile pacman.conf and strip all settings that would break in chroot when using pacman -r
     # append CacheDir and HookDir to [options] section
     # HookDir is *always* set to the airootfs' override directory
-    sed "/\[options\]/a CacheDir = ${_cache_dirs}
-        /\[options\]/a HookDir = ${airootfs_dir}/etc/pacman.d/hooks/" \
-        -i "${work_dir}/pacman.conf"
+    # see `man 8 pacman` for further info
+    pacman-conf --config "${pacman_conf}" | \
+        sed "/CacheDir/d;/DBPath/d;/HookDir/d;/LogFile/d;/RootDir/d;/\[options\]/a CacheDir = ${_cache_dirs}
+        /\[options\]/a HookDir = ${airootfs_dir}/etc/pacman.d/hooks/" > "${work_dir}/pacman.conf"
 }
 
 # Prepare working directory and copy custom airootfs files (airootfs)
-- 
cgit v1.2.3-70-g09d2


From d153b4861364daa2e056d4cc70c57a60ab286b71 Mon Sep 17 00:00:00 2001
From: Christian Hesse <mail@eworm.de>
Date: Tue, 5 Jan 2021 22:26:15 +0100
Subject: mkarchiso: fix typos

---
 archiso/mkarchiso | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'archiso/mkarchiso')

diff --git a/archiso/mkarchiso b/archiso/mkarchiso
index a75fc2a..b83f104 100755
--- a/archiso/mkarchiso
+++ b/archiso/mkarchiso
@@ -351,7 +351,7 @@ _make_bootmodes() {
 # Prepare kernel/initramfs ${install_dir}/boot/
 _make_boot_on_iso9660() {
     local ucode_image
-    _msg_info "Preparing kernel and intramfs for the ISO 9660 file system..."
+    _msg_info "Preparing kernel and initramfs for the ISO 9660 file system..."
     install -d -m 0755 -- "${isofs_dir}/${install_dir}/boot/${arch}"
     install -m 0644 -- "${airootfs_dir}/boot/initramfs-"*".img" "${isofs_dir}/${install_dir}/boot/${arch}/"
     install -m 0644 -- "${airootfs_dir}/boot/vmlinuz-"* "${isofs_dir}/${install_dir}/boot/${arch}/"
@@ -450,7 +450,7 @@ _make_efi_dir_on_iso9660() {
 # Prepare kernel/initramfs on efiboot.img
 _make_boot_on_fat() {
     local ucode_image all_ucode_images=()
-    _msg_info "Preparing kernel and intramfs for the FAT file system..."
+    _msg_info "Preparing kernel and initramfs for the FAT file system..."
     mmd -i "${work_dir}/efiboot.img" \
         "::/${install_dir}" "::/${install_dir}/boot" "::/${install_dir}/boot/${arch}"
     mcopy -i "${work_dir}/efiboot.img" "${airootfs_dir}/boot/vmlinuz-"* \
-- 
cgit v1.2.3-70-g09d2


From b30d1cad9bdf925b976b5d038a3ad741a70267c6 Mon Sep 17 00:00:00 2001
From: Christian Hesse <mail@eworm.de>
Date: Wed, 6 Jan 2021 11:59:53 +0100
Subject: mkarchiso: add version information

To date the iso version was used for iso volume information and iso file name.
In my custom builds I do use it a lot more:

* Inside the root fs: The system knows about its own version. I use this to:
  -> report the version to a server (poor man's inventory)
  -> let the system update itself

* On the iso fs: The files are served via rsync, running systems transfer
  version file first to check for available update.

* A grub environment file on the iso fs: Booting the iso from grub allows
  to create cow directory per version:

    loopback loop archlinux.iso
    load_env -f (loop)/arch/grubenv
    linux (loop)/arch/boot/x86_64/vmlinuz-linux ... \
        cow_directory=archlinux/${VERSION} ...

So let's just create these files.
---
 README.rst        | 13 +++++++++++++
 archiso/mkarchiso | 11 ++++++++++-
 2 files changed, 23 insertions(+), 1 deletion(-)

(limited to 'archiso/mkarchiso')

diff --git a/README.rst b/README.rst
index 03420b4..00e79e1 100644
--- a/README.rst
+++ b/README.rst
@@ -118,6 +118,19 @@ Optionally install archiso's mkinitcpio hooks:
 
     make install-initcpio
 
+Optional Features
+=================
+
+The iso image contains a grub environment block holding the iso version. This allows to boot the iso image from grub
+with a version specific cow directory to mitigate overlay clashes.
+
+  .. code:: grub
+      loopback loop archlinux.iso
+      load_env -f (loop)/arch/grubenv
+      linux (loop)/arch/boot/x86_64/vmlinuz-linux ... \
+          cow_directory=archlinux/${VERSION} ...
+      initrd (loop)/arch/boot/x86_64/initramfs-linux-lts.img
+
 Contribute
 ==========
 
diff --git a/archiso/mkarchiso b/archiso/mkarchiso
index b83f104..edad3a8 100755
--- a/archiso/mkarchiso
+++ b/archiso/mkarchiso
@@ -834,11 +834,19 @@ _set_overrides() {
     _msg_info "Done!"
 }
 
-
 _export_gpg_publickey() {
     gpg --batch --output "${work_dir}/pubkey.gpg" --export "${gpg_key}"
 }
 
+_make_version() {
+    install -d -m 0755 -- "${isofs_dir}/${install_dir}"
+    _msg_info "Creating files with iso version..."
+    printf '%s\n' "${iso_version}" > "${airootfs_dir}/version"
+    printf '%s\n' "${iso_version}" > "${isofs_dir}/${install_dir}/version"
+    printf '%.1024s' "$(printf '# GRUB Environment Block\nVERSION=%s\n%s' "${iso_version}" \
+        "$(printf '%0.1s' "#"{1..1024})")" > "${isofs_dir}/${install_dir}/grubenv"
+    _msg_info "Done!"
+}
 
 _make_pkglist() {
     install -d -m 0755 -- "${isofs_dir}/${install_dir}"
@@ -867,6 +875,7 @@ _build_profile() {
     [[ -n "${gpg_key}" ]] && _run_once _export_gpg_publickey
     _run_once _make_custom_airootfs
     _run_once _make_packages
+    _run_once _make_version
     _run_once _make_customize_airootfs
     _run_once _make_pkglist
     _make_bootmodes
-- 
cgit v1.2.3-70-g09d2


From 0f20a11bb7c663425a428d8de7faebefac951c6a Mon Sep 17 00:00:00 2001
From: nl6720 <nl6720@gmail.com>
Date: Sat, 5 Dec 2020 14:13:56 +0200
Subject: Support setting more variables in profiledef.sh and rework the way
 overrides are applied

- Apply overrides before validating the options.
- Parse all paths with realpath. Fixes https://gitlab.archlinux.org/archlinux/archiso/-/issues/84 .
---
 archiso/mkarchiso | 222 ++++++++++++++++++++++++++++++++----------------------
 1 file changed, 133 insertions(+), 89 deletions(-)

(limited to 'archiso/mkarchiso')

diff --git a/archiso/mkarchiso b/archiso/mkarchiso
index edad3a8..021bcfa 100755
--- a/archiso/mkarchiso
+++ b/archiso/mkarchiso
@@ -9,34 +9,28 @@ umask 0022
 export LANG="C"
 export SOURCE_DATE_EPOCH="${SOURCE_DATE_EPOCH:-"$(date +%s)"}"
 
-# mkarchiso defaults
+# Set application name from the script's file name
 app_name="${0##*/}"
+
+# Define global variables. All of them will be overwritten later
 pkg_list=()
-quiet="y"
-work_dir="work"
-out_dir="out"
-img_name="${app_name}.iso"
+quiet=""
+work_dir=""
+out_dir=""
+img_name=""
 gpg_key=""
-override_gpg_key=""
-
-# profile defaults
-profile=""
-iso_name="${app_name}"
-iso_label="${app_name^^}"
-override_iso_label=""
-iso_publisher="${app_name}"
-override_iso_publisher=""
-iso_application="${app_name} iso"
-override_iso_application=""
+iso_name=""
+iso_label=""
+iso_publisher=""
+iso_application=""
 iso_version=""
-install_dir="${app_name}"
-override_install_dir=""
-arch="$(uname -m)"
-pacman_conf="/etc/pacman.conf"
-override_pacman_conf=""
+install_dir=""
+arch=""
+pacman_conf=""
+packages=""
 bootmodes=()
-airootfs_image_type="squashfs"
-airootfs_image_tool_options=('-comp' 'xz')
+airootfs_image_type=""
+airootfs_image_tool_options=()
 declare -A file_permissions=()
 
 
@@ -103,7 +97,8 @@ usage: ${app_name} [options] <profile_dir>
      -h               This message
      -o <out_dir>     Set the output directory
                       Default: '${out_dir}'
-     -p PACKAGE(S)    Package(s) to install, can be used multiple times
+     -p PACKAGE(S)    Package(s) to install.
+                      Multiple packages are provided as quoted, space delimited list.
      -v               Enable verbose output
      -w <work_dir>    Set the working directory
                       Default: '${work_dir}'
@@ -160,6 +155,11 @@ _cleanup_airootfs() {
 }
 
 _run_mksquashfs() {
+    # Set default mksquashfs options
+    if (( ${#airootfs_image_tool_options[@]} < 1 )); then
+        airootfs_image_tool_options=('-comp' 'xz')
+    fi
+
     local image_path="${isofs_dir}/${install_dir}/${arch}/airootfs.sfs"
     if [[ "${quiet}" == "y" ]]; then
         mksquashfs "$@" "${image_path}" -noappend "${airootfs_image_tool_options[@]}" -no-progress > /dev/null
@@ -266,7 +266,7 @@ _make_custom_airootfs() {
         for filename in "${!file_permissions[@]}"; do
             IFS=':' read -ra permissions <<< "${file_permissions["${filename}"]}"
             # Prevent file path traversal outside of $airootfs_dir
-            if [[ "$(realpath -q -- "${airootfs_dir}${filename}")" != "$(realpath -q -- "${airootfs_dir}")"* ]]; then
+            if [[ "$(realpath -q -- "${airootfs_dir}${filename}")" != "${airootfs_dir}"* ]]; then
                 _msg_error "Failed to set permissions on '${airootfs_dir}${filename}'. Outside of valid path." 1
             # Warn if the file does not exist
             elif [[ ! -e "${airootfs_dir}${filename}" ]]; then
@@ -749,10 +749,6 @@ _build_iso() {
 
 # Read profile's values from profiledef.sh
 _read_profile() {
-    local validation_error=0
-    local bootmode
-
-    _msg_info "Reading profile..."
     if [[ -z "${profile}" ]]; then
         _msg_error "No profile specified!" 1
     fi
@@ -767,71 +763,123 @@ _read_profile() {
         # shellcheck source=configs/releng/profiledef.sh
         . "${profile}/profiledef.sh"
 
-        # Resolve paths
-        packages="$(realpath -- "${profile}/packages.${arch}")"
+        # Resolve paths of files that are expected to reside in the profile's directory
+        [[ -n "$packages" ]] || packages="${profile}/packages.${arch}"
+        packages="$(realpath -- "${packages}")"
         pacman_conf="$(realpath -- "${pacman_conf}")"
 
         cd -- "${OLDPWD}"
+    fi
+}
 
-        # Validate profile
-        # Check if the package list file exists and read packages from it
-        if [[ -e "${packages}" ]]; then
-            mapfile -t pkg_list < <(sed '/^[[:blank:]]*#.*/d;s/#.*//;/^[[:blank:]]*$/d' "${packages}")
-            if (( ${#pkg_list} < 1 )); then
-                (( validation_error=validation_error+1 ))
-                _msg_error "No package specified in '${packages}'." 0
-            fi
-        else
-            (( validation_error=validation_error+1 ))
-            _msg_error "File '${packages}' does not exist." 0
-        fi
-        # Check if pacman configuration file exists
-        if [[ ! -e "${pacman_conf}" ]]; then
+# Validate set options
+_validate_options() {
+    local validation_error=0 bootmode
+    local pkg_list_from_file=()
+    _msg_info "Validating options..."
+    # Check if the package list file exists and read packages from it
+    if [[ -e "${packages}" ]]; then
+        mapfile -t pkg_list_from_file < <(sed '/^[[:blank:]]*#.*/d;s/#.*//;/^[[:blank:]]*$/d' "${packages}")
+        pkg_list+=("${pkg_list_from_file[@]}")
+        if (( ${#pkg_list_from_file} < 1 )); then
             (( validation_error=validation_error+1 ))
-            _msg_error "File '${pacman_conf}' does not exist." 0
+            _msg_error "No package specified in '${packages}'." 0
         fi
-        # Check if the specified bootmodes are supported
-        for bootmode in "${bootmodes[@]}"; do
-            if typeset -f "_make_bootmode_${bootmode}" &> /dev/null; then
-                if typeset -f "_validate_requirements_bootmode_${bootmode}" &> /dev/null; then
-                    "_validate_requirements_bootmode_${bootmode}"
-                else
-                    _msg_warning "Function '_validate_requirements_bootmode_${bootmode}' does not exist. Validating the requirements of '${bootmode}' boot mode will not be possible."
-                fi
-            else
-                (( validation_error=validation_error+1 ))
-                _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
-                "_validate_requirements_airootfs_image_type_${airootfs_image_type}"
+    else
+        (( validation_error=validation_error+1 ))
+        _msg_error "File '${packages}' does not exist." 0
+
+    fi
+
+    # Check if pacman configuration file exists
+    if [[ ! -e "${pacman_conf}" ]]; then
+        (( validation_error=validation_error+1 ))
+        _msg_error "File '${pacman_conf}' does not exist." 0
+    fi
+    # Check if the specified bootmodes are supported
+    for bootmode in "${bootmodes[@]}"; do
+        if typeset -f "_make_bootmode_${bootmode}" &> /dev/null; then
+            if typeset -f "_validate_requirements_bootmode_${bootmode}" &> /dev/null; then
+                "_validate_requirements_bootmode_${bootmode}"
             else
-                _msg_warning "Function '_validate_requirements_airootfs_image_type_${airootfs_image_type}' does not exist. Validating the requirements of '${airootfs_image_type}' airootfs image type will not be possible."
+                _msg_warning "Function '_validate_requirements_bootmode_${bootmode}' does not exist. Validating the requirements of '${bootmode}' boot mode will not be possible."
             fi
         else
             (( validation_error=validation_error+1 ))
-            _msg_error "Unsupported image type: '${airootfs_image_type}'" 0
+            _msg_error "${bootmode} is not a valid boot mode!" 0
         fi
-        if (( validation_error )); then
-            _msg_error "${validation_error} errors were encountered while validating the profile. Aborting." 1
+    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
+            "_validate_requirements_airootfs_image_type_${airootfs_image_type}"
+        else
+            _msg_warning "Function '_validate_requirements_airootfs_image_type_${airootfs_image_type}' does not exist. Validating the requirements of '${airootfs_image_type}' airootfs image type will not be possible."
         fi
+    else
+        (( validation_error=validation_error+1 ))
+        _msg_error "Unsupported image type: '${airootfs_image_type}'" 0
+    fi
+    if (( validation_error )); then
+        _msg_error "${validation_error} errors were encountered while validating the profile. Aborting." 1
     fi
     _msg_info "Done!"
 }
 
-# set overrides from mkarchiso option parameters, if present
+# Set defaults and, if present, overrides from mkarchiso command line option parameters
 _set_overrides() {
-    _msg_info "Setting overrides..."
-    [[ -n "$override_iso_label" ]] && iso_label="$override_iso_label"
-    [[ -n "$override_iso_publisher" ]] && iso_publisher="$override_iso_publisher"
-    [[ -n "$override_iso_application" ]] && iso_application="$override_iso_application"
-    [[ -n "$override_install_dir" ]] && install_dir="$override_install_dir"
-    [[ -n "$override_pacman_conf" ]] && pacman_conf="$override_pacman_conf"
-    [[ -n "$override_gpg_key" ]] && gpg_key="$override_gpg_key"
-    # NOTE: the call to _msg_info() conveniently guards this function from evaluating to false
-    _msg_info "Done!"
+    # Set variables that have command line overrides
+    if [[ -v override_work_dir ]]; then
+        work_dir="$override_work_dir"
+    elif [[ -z "$work_dir" ]]; then
+        work_dir='./work'
+    fi
+    work_dir="$(realpath -- "$work_dir")"
+    if [[ -v override_out_dir ]]; then
+        out_dir="$override_out_dir"
+    elif [[ -z "$out_dir" ]]; then
+        out_dir='./out'
+    fi
+    out_dir="$(realpath -- "$out_dir")"
+    if [[ -v override_pacman_conf ]]; then
+        pacman_conf="$override_pacman_conf"
+    elif [[ -z "$pacman_conf" ]]; then
+        pacman_conf="/etc/pacman.conf"
+    fi
+    pacman_conf="$(realpath -- "$pacman_conf")"
+    [[ ! -v override_pkg_list ]] || pkg_list+=("${override_pkg_list[@]}")
+    if [[ -v override_iso_label ]]; then
+        iso_label="$override_iso_label"
+    elif [[ -z "$iso_label" ]]; then
+        iso_label="${app_name^^}"
+    fi
+    if [[ -v override_iso_publisher ]]; then
+        iso_publisher="$override_iso_publisher"
+    elif [[ -z "$iso_publisher" ]]; then
+        iso_publisher="${app_name}"
+    fi
+    if [[ -v override_iso_application ]]; then
+        iso_application="$override_iso_application"
+    elif [[ -z "$iso_application" ]]; then
+        iso_application="${app_name} iso"
+    fi
+    if [[ -v override_install_dir ]]; then
+        install_dir="$override_install_dir"
+    elif [[ -z "$install_dir" ]]; then
+        install_dir="${app_name}"
+    fi
+    [[ ! -v override_gpg_key ]] || gpg_key="$override_gpg_key"
+    if [[ -v override_quiet ]]; then
+        quiet="$override_quiet"
+    elif [[ -z "$quiet" ]]; then
+        quiet="y"
+    fi
+
+    # Set variables that do not have overrides
+    [[ -n "$arch" ]] || arch="$(uname -m)"
+    [[ -n "$airootfs_image_type" ]] || airootfs_image_type="squashfs"
+    [[ -n "$iso_name" ]] || iso_name="${app_name}"
+    [[ -n "$img_name" ]] || img_name="${iso_name}-${iso_version}-${arch}.iso"
 }
 
 _export_gpg_publickey() {
@@ -859,8 +907,6 @@ _build_profile() {
     # Set up essential directory paths
     airootfs_dir="${work_dir}/${arch}/airootfs"
     isofs_dir="${work_dir}/iso"
-    # Set ISO file name
-    img_name="${iso_name}-${iso_version}-${arch}.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
@@ -870,9 +916,9 @@ _build_profile() {
         printf '%s\n' "$SOURCE_DATE_EPOCH" > "${work_dir}/build_date"
     fi
 
-    [[ "${quiet}" == "n" ]] && _show_config
+    [[ "${quiet}" == "y" ]] || _show_config
     _run_once _make_pacman_conf
-    [[ -n "${gpg_key}" ]] && _run_once _export_gpg_publickey
+    [[ -z "${gpg_key}" ]] || _run_once _export_gpg_publickey
     _run_once _make_custom_airootfs
     _run_once _make_packages
     _run_once _make_version
@@ -886,19 +932,16 @@ _build_profile() {
 
 while getopts 'p:C:L:P:A:D:w:o:g:vh?' arg; do
     case "${arg}" in
-        p)
-            read -r -a opt_pkg_list <<< "${OPTARG}"
-            pkg_list+=("${opt_pkg_list[@]}")
-            ;;
-        C) override_pacman_conf="$(realpath -- "${OPTARG}")" ;;
+        p) read -r -a override_pkg_list <<< "${OPTARG}" ;;
+        C) override_pacman_conf="${OPTARG}" ;;
         L) override_iso_label="${OPTARG}" ;;
         P) override_iso_publisher="${OPTARG}" ;;
         A) override_iso_application="${OPTARG}" ;;
         D) override_install_dir="${OPTARG}" ;;
-        w) work_dir="$(realpath -- "${OPTARG}")" ;;
-        o) out_dir="$(realpath -- "${OPTARG}")" ;;
+        w) override_work_dir="${OPTARG}" ;;
+        o) override_out_dir="${OPTARG}" ;;
         g) override_gpg_key="${OPTARG}" ;;
-        v) quiet="n" ;;
+        v) override_quiet="n" ;;
         h|?) _usage 0 ;;
         *)
             _msg_error "Invalid argument '${arg}'" 0
@@ -923,6 +966,7 @@ profile="$(realpath -- "${1}")"
 
 _read_profile
 _set_overrides
+_validate_options
 _build_profile
 
 # vim:ts=4:sw=4:et:
-- 
cgit v1.2.3-70-g09d2


From bc67933af14c28eb385b537a6afa3aa6e458af59 Mon Sep 17 00:00:00 2001
From: nl6720 <nl6720@gmail.com>
Date: Sat, 24 Oct 2020 15:53:57 +0300
Subject: Support EROFS

EROFS, like Squashfs, is a read-only file system. It can be used to store airootfs in an image file.
Its advantage is the support for POSIX ACLs. EROFS downside is that currently it only supports LZ4 compression (LZMA support is not yet fully implemented).

A difference from Squashfs is that, EROFS stores change time (ctime) not modification time (mtime). The reverse is true for Squashfs.

Implements https://gitlab.archlinux.org/archlinux/archiso/-/issues/59
---
 README.profile.rst                      |  8 +++---
 archiso/initcpio/hooks/archiso          | 45 +++++++++++++++++++++++++++++----
 archiso/initcpio/hooks/archiso_pxe_http | 10 ++++++--
 archiso/mkarchiso                       | 32 +++++++++++++++++++++--
 configs/baseline/profiledef.sh          |  1 +
 configs/releng/profiledef.sh            |  1 +
 6 files changed, 85 insertions(+), 12 deletions(-)

(limited to 'archiso/mkarchiso')

diff --git a/README.profile.rst b/README.profile.rst
index 6541bd7..7680628 100644
--- a/README.profile.rst
+++ b/README.profile.rst
@@ -49,9 +49,11 @@ The image file is constructed from some of the variables in **profiledef.sh**: `
 
   - `squashfs`: Create a squashfs image directly from the airootfs work directory
   - `ext4+squashfs`: Create an ext4 partition, copy the airootfs work directory to it and create a squashfs image from it
-* `airootfs_image_tool_options`: An array of options to pass to the tool to create the airootfs image. Currently only
-  `mksquashfs` is supported - see `mksquashfs --help` for all possible options (defaults to `('-comp' 'xz')`).
-  - `file_permissions`: An associative array that lists files and/or directories who need specific ownership or
+  - `erofs`: Create an EROFS image for the airootfs work directory
+* `airootfs_image_tool_options`: An array of options to pass to the tool to create the airootfs image. `mksquashfs` and
+  `mkfs.erofs` are supported. See `mksquashfs --help` or `mkfs.erofs --help` for all possible options (defaults to
+  `('-comp' 'xz')` for squashfs).
+* `file_permissions`: An associative array that lists files and/or directories who need specific ownership or
   permissions. The array's keys contain the path and the value is a colon separated list of owner UID, owner GID and
   access mode. E.g. `file_permissions=(["/etc/shadow"]="0:0:400")`.
 
diff --git a/archiso/initcpio/hooks/archiso b/archiso/initcpio/hooks/archiso
index bf98332..1b848ce 100644
--- a/archiso/initcpio/hooks/archiso
+++ b/archiso/initcpio/hooks/archiso
@@ -81,12 +81,36 @@ _mnt_sfs() {
     _mnt_dev "${sfs_dev}" "${mnt}" "-r" "defaults"
 }
 
+# args: /path/to/image_file, mountpoint
+_mnt_erofs() {
+    local img="${1}"
+    local mnt="${2}"
+    local img_fullname="${img##*/}"
+    local erofs_dev
+
+    # shellcheck disable=SC2154
+    # defined via initcpio's parse_cmdline()
+    if [ "${copytoram}" = "y" ]; then
+        msg -n ":: Copying EROFS image to RAM..."
+        if ! cp -- "${img}" "/run/archiso/copytoram/${img_fullname}" ; then
+            echo "ERROR: while copy '${img}' to '/run/archiso/copytoram/${img_fullname}'"
+            launch_interactive_shell
+        fi
+        img="/run/archiso/copytoram/${img_fullname}"
+        msg "done."
+    fi
+    erofs_dev="$(losetup --find --show --read-only -- "${img}")"
+    echo "${erofs_dev}" >> /run/archiso/used_block_devices
+    _mnt_dev "${erofs_dev}" "${mnt}" "-r" "defaults" "erofs"
+}
+
 # args: device, mountpoint, flags, opts
 _mnt_dev() {
     local dev="${1}"
     local mnt="${2}"
     local flg="${3}"
     local opts="${4}"
+    local fstype="${5:-auto}"
 
     mkdir -p "${mnt}"
 
@@ -99,7 +123,7 @@ _mnt_dev() {
         launch_interactive_shell
     done
 
-    if mount -o "${opts}" "${flg}" "${dev}" "${mnt}"; then
+    if mount -t "${fstype}" -o "${opts}" "${flg}" "${dev}" "${mnt}"; then
         msg ":: Device '${dev}' mounted successfully."
     else
         echo "ERROR; Failed to mount '${dev}'"
@@ -120,8 +144,9 @@ _verify_checksum() {
 
 _verify_signature() {
     local _status
+    local sigfile="${1}"
     cd "/run/archiso/bootmnt/${archisobasedir}/${arch}" || exit 1
-    gpg --homedir /gpg --status-fd 1 --verify airootfs.sfs.sig 2>/dev/null | grep -qE '^\[GNUPG:\] GOODSIG'
+    gpg --homedir /gpg --status-fd 1 --verify "${sigfile}" 2>/dev/null | grep -qE '^\[GNUPG:\] GOODSIG'
     _status=$?
     cd -- "${OLDPWD}" || exit 1
     return ${_status}
@@ -160,6 +185,7 @@ run_hook() {
 # args: /path/to/newroot
 archiso_mount_handler() {
     local newroot="${1}"
+    local sigfile
 
     if ! mountpoint -q "/run/archiso/bootmnt"; then
         _mnt_dev "${archisodevice}" "/run/archiso/bootmnt" "-r" "defaults"
@@ -190,15 +216,20 @@ archiso_mount_handler() {
     # defined via initcpio's parse_cmdline()
     if [ "${verify}" = "y" ]; then
         if [ -f "/run/archiso/bootmnt/${archisobasedir}/${arch}/airootfs.sfs.sig" ]; then
+            sigfile="airootfs.sfs.sig"
+        elif [ -f "/run/archiso/bootmnt/${archisobasedir}/${arch}/airootfs.erofs.sig" ]; then
+            sigfile="airootfs.erofs.sig"
+        fi
+        if [ -n "${sigfile}" ]; then
             msg -n ":: Signature verification requested, please wait..."
-            if _verify_signature; then
+            if _verify_signature "${sigfile}"; then
                 msg "done. Signature is OK, continue booting."
             else
                 echo "ERROR: one or more files are corrupted"
                 launch_interactive_shell
             fi
         else
-            echo "ERROR: verify=y option specified but ${archisobasedir}/${arch}/airootfs.sfs.sig not found"
+            echo "ERROR: verify=y option specified but GPG signature not found in ${archisobasedir}/${arch}/"
             launch_interactive_shell
         fi
     fi
@@ -221,7 +252,11 @@ archiso_mount_handler() {
     mkdir -p "/run/archiso/cowspace/${cow_directory}"
     chmod 0700 "/run/archiso/cowspace/${cow_directory}"
 
-    _mnt_sfs "/run/archiso/bootmnt/${archisobasedir}/${arch}/airootfs.sfs" "/run/archiso/airootfs"
+    if [ -f "/run/archiso/bootmnt/${archisobasedir}/${arch}/airootfs.sfs" ]; then
+        _mnt_sfs "/run/archiso/bootmnt/${archisobasedir}/${arch}/airootfs.sfs" "/run/archiso/airootfs"
+    elif [ -f "/run/archiso/bootmnt/${archisobasedir}/${arch}/airootfs.erofs" ]; then
+        _mnt_erofs "/run/archiso/bootmnt/${archisobasedir}/${arch}/airootfs.erofs" "/run/archiso/airootfs"
+    fi
     if [ -f "/run/archiso/airootfs/airootfs.img" ]; then
         _mnt_dmsnapshot "/run/archiso/airootfs/airootfs.img" "${newroot}" "/"
     else
diff --git a/archiso/initcpio/hooks/archiso_pxe_http b/archiso/initcpio/hooks/archiso_pxe_http
index efae923..43b8b4b 100644
--- a/archiso/initcpio/hooks/archiso_pxe_http
+++ b/archiso/initcpio/hooks/archiso_pxe_http
@@ -39,6 +39,7 @@ _curl_get() {
 
 archiso_pxe_http_mount_handler () {
     newroot="${1}"
+    local img_type="sfs"
 
     msg ":: Mounting /run/archiso/httpspace (tmpfs) filesystem, size='${archiso_http_spc}'"
     mkdir -p "/run/archiso/httpspace"
@@ -46,7 +47,12 @@ archiso_pxe_http_mount_handler () {
 
     # shellcheck disable=SC2154
     # defined via initcpio's parse_cmdline()
-    _curl_get "${archiso_http_srv}${archisobasedir}/${arch}/airootfs.sfs" "/${arch}"
+    if ! curl -L -f -o /dev/null -s -r 0-0 "${archiso_http_srv}${archisobasedir}/${arch}/airootfs.sfs"; then
+        if curl -L -f -o /dev/null -s -r 0-0 "${archiso_http_srv}${archisobasedir}/${arch}/airootfs.erofs"; then
+            img_type="erofs"
+        fi
+    fi
+    _curl_get "${archiso_http_srv}${archisobasedir}/${arch}/airootfs.${img_type}" "/${arch}"
 
     # shellcheck disable=SC2154
     # defined via initcpio's parse_cmdline()
@@ -56,7 +62,7 @@ archiso_pxe_http_mount_handler () {
     # shellcheck disable=SC2154
     # defined via initcpio's parse_cmdline()
     if [ "${verify}" = "y" ]; then
-        _curl_get "${archiso_http_srv}${archisobasedir}/${arch}/airootfs.sfs.sig" "/${arch}"
+        _curl_get "${archiso_http_srv}${archisobasedir}/${arch}/airootfs.${img_type}.sig" "/${arch}"
     fi
 
     mkdir -p "/run/archiso/bootmnt"
diff --git a/archiso/mkarchiso b/archiso/mkarchiso
index 021bcfa..0d7c698 100755
--- a/archiso/mkarchiso
+++ b/archiso/mkarchiso
@@ -200,13 +200,30 @@ _mkairootfs_squashfs() {
     install -d -m 0755 -- "${isofs_dir}/${install_dir}/${arch}"
     _msg_info "Creating SquashFS image, this may take some time..."
     _run_mksquashfs "${airootfs_dir}"
+}
+
+# Makes an EROFS file system from a source directory.
+_mkairootfs_erofs() {
+    local fsuuid
+    [[ -e "${airootfs_dir}" ]] || _msg_error "The path '${airootfs_dir}' does not exist" 1
+
+    install -d -m 0755 -- "${isofs_dir}/${install_dir}/${arch}"
+    local image_path="${isofs_dir}/${install_dir}/${arch}/airootfs.erofs"
+    # Generate reproducible file system UUID from SOURCE_DATE_EPOCH
+    fsuuid="$(uuidgen --sha1 --namespace 93a870ff-8565-4cf3-a67b-f47299271a96 --name "${SOURCE_DATE_EPOCH}")"
+    _msg_info "Creating EROFS image, this may take some time..."
+    mkfs.erofs -U "${fsuuid}" "${airootfs_image_tool_options[@]}" -- "${image_path}" "${airootfs_dir}"
     _msg_info "Done!"
 }
 
 _mkchecksum() {
     _msg_info "Creating checksum file for self-test..."
     cd -- "${isofs_dir}/${install_dir}/${arch}"
-    sha512sum airootfs.sfs > airootfs.sha512
+    if [[ -e "${isofs_dir}/${install_dir}/${arch}/airootfs.sfs" ]]; then
+        sha512sum airootfs.sfs > airootfs.sha512
+    elif [[ -e "${isofs_dir}/${install_dir}/${arch}/airootfs.erofs" ]]; then
+        sha512sum airootfs.erofs > airootfs.sha512
+    fi
     cd -- "${OLDPWD}"
     _msg_info "Done!"
 }
@@ -214,7 +231,11 @@ _mkchecksum() {
 _mksignature() {
     _msg_info "Signing SquashFS image..."
     cd -- "${isofs_dir}/${install_dir}/${arch}"
-    gpg --detach-sign --default-key "${gpg_key}" airootfs.sfs
+    if [[ -e "${isofs_dir}/${install_dir}/${arch}/airootfs.sfs" ]]; then
+        gpg --detach-sign --default-key "${gpg_key}" airootfs.sfs
+    elif [[ -e "${isofs_dir}/${install_dir}/${arch}/airootfs.erofs" ]]; then
+        gpg --detach-sign --default-key "${gpg_key}" airootfs.erofs
+    fi
     cd -- "${OLDPWD}"
     _msg_info "Done!"
 }
@@ -634,6 +655,13 @@ _validate_requirements_airootfs_image_type_ext4+squashfs() {
     _validate_requirements_airootfs_image_type_squashfs
 }
 
+_validate_requirements_airootfs_image_type_erofs() {
+    if ! command -v mkfs.erofs; then
+        (( validation_error=validation_error+1 ))
+        _msg_error "Validating '${airootfs_image_type}': mkfs.erofs is not available on this host. Install 'erofs-utils'!" 0
+    fi
+}
+
 # SYSLINUX El Torito
 _add_xorrisofs_options_bios.syslinux.eltorito() {
     xorrisofs_options+=(
diff --git a/configs/baseline/profiledef.sh b/configs/baseline/profiledef.sh
index de9edfa..7c89c0f 100644
--- a/configs/baseline/profiledef.sh
+++ b/configs/baseline/profiledef.sh
@@ -10,6 +10,7 @@ install_dir="arch"
 bootmodes=('bios.syslinux.mbr' 'bios.syslinux.eltorito' 'uefi-x64.systemd-boot.esp' 'uefi-x64.systemd-boot.eltorito')
 arch="x86_64"
 pacman_conf="pacman.conf"
+airootfs_image_type="squashfs"
 airootfs_image_tool_options=('-comp' 'xz' '-Xbcj' 'x86' '-b' '1M' '-Xdict-size' '1M')
 file_permissions=(
   ["/etc/shadow"]="0:0:400"
diff --git a/configs/releng/profiledef.sh b/configs/releng/profiledef.sh
index 2d45ebd..d5f8bcb 100644
--- a/configs/releng/profiledef.sh
+++ b/configs/releng/profiledef.sh
@@ -10,6 +10,7 @@ install_dir="arch"
 bootmodes=('bios.syslinux.mbr' 'bios.syslinux.eltorito' 'uefi-x64.systemd-boot.esp' 'uefi-x64.systemd-boot.eltorito')
 arch="x86_64"
 pacman_conf="pacman.conf"
+airootfs_image_type="squashfs"
 airootfs_image_tool_options=('-comp' 'xz' '-Xbcj' 'x86' '-b' '1M' '-Xdict-size' '1M')
 file_permissions=(
   ["/etc/shadow"]="0:0:400"
-- 
cgit v1.2.3-70-g09d2


From 6bb12552e4c5351bf5c7c839e75d6bb77c0f7cc6 Mon Sep 17 00:00:00 2001
From: Michael Gilchrist <michaelgilch@gmail.com>
Date: Sun, 21 Mar 2021 14:00:13 +0000
Subject: Recursively change file permissions for folders listed in
 profiledef.sh

- if a folder listed in the associative array ends with a "/",
  recursively apply chmod and chown.
---
 README.profile.rst | 2 +-
 archiso/mkarchiso  | 9 +++++++--
 2 files changed, 8 insertions(+), 3 deletions(-)

(limited to 'archiso/mkarchiso')

diff --git a/README.profile.rst b/README.profile.rst
index 7680628..c22e7bb 100644
--- a/README.profile.rst
+++ b/README.profile.rst
@@ -55,7 +55,7 @@ The image file is constructed from some of the variables in **profiledef.sh**: `
   `('-comp' 'xz')` for squashfs).
 * `file_permissions`: An associative array that lists files and/or directories who need specific ownership or
   permissions. The array's keys contain the path and the value is a colon separated list of owner UID, owner GID and
-  access mode. E.g. `file_permissions=(["/etc/shadow"]="0:0:400")`.
+  access mode. E.g. `file_permissions=(["/etc/shadow"]="0:0:400")`. When directories are listed with a trailing backslash ("/") **all** files and directories contained within the listed directory will have the same owner UID, owner GID, and access mode applied recursively.
 
 packages.arch
 =============
diff --git a/archiso/mkarchiso b/archiso/mkarchiso
index 0d7c698..f9c64ac 100755
--- a/archiso/mkarchiso
+++ b/archiso/mkarchiso
@@ -293,8 +293,13 @@ _make_custom_airootfs() {
             elif [[ ! -e "${airootfs_dir}${filename}" ]]; then
                 _msg_warning "Cannot change permissions of '${airootfs_dir}${filename}'. The file or directory does not exist."
             else
-                chown -fh -- "${permissions[0]}:${permissions[1]}" "${airootfs_dir}${filename}"
-                chmod -f -- "${permissions[2]}" "${airootfs_dir}${filename}"
+                if [[ "${filename: -1}" == "/" ]]; then
+                    chown -fhR -- "${permissions[0]}:${permissions[1]}" "${airootfs_dir}${filename}"
+                    chmod -fR -- "${permissions[2]}" "${airootfs_dir}${filename}"
+                else
+                    chown -fh -- "${permissions[0]}:${permissions[1]}" "${airootfs_dir}${filename}"
+                    chmod -f -- "${permissions[2]}" "${airootfs_dir}${filename}"
+                fi
             fi
         done
         _msg_info "Done!"
-- 
cgit v1.2.3-70-g09d2


From 8cbc5483591a74fee2b566eff92e1423cbe9c0ad Mon Sep 17 00:00:00 2001
From: nl6720 <nl6720@gmail.com>
Date: Sun, 21 Mar 2021 14:44:50 +0200
Subject: mkarchiso: do not set default mksquashfs options

Remove hardcoded '-comp xz', it prevents using mksquashfs defaults.

Fixes #112.
---
 README.profile.rst | 3 +--
 archiso/mkarchiso  | 5 -----
 2 files changed, 1 insertion(+), 7 deletions(-)

(limited to 'archiso/mkarchiso')

diff --git a/README.profile.rst b/README.profile.rst
index c22e7bb..89477d2 100644
--- a/README.profile.rst
+++ b/README.profile.rst
@@ -51,8 +51,7 @@ The image file is constructed from some of the variables in **profiledef.sh**: `
   - `ext4+squashfs`: Create an ext4 partition, copy the airootfs work directory to it and create a squashfs image from it
   - `erofs`: Create an EROFS image for the airootfs work directory
 * `airootfs_image_tool_options`: An array of options to pass to the tool to create the airootfs image. `mksquashfs` and
-  `mkfs.erofs` are supported. See `mksquashfs --help` or `mkfs.erofs --help` for all possible options (defaults to
-  `('-comp' 'xz')` for squashfs).
+  `mkfs.erofs` are supported. See `mksquashfs --help` or `mkfs.erofs --help` for all possible options.
 * `file_permissions`: An associative array that lists files and/or directories who need specific ownership or
   permissions. The array's keys contain the path and the value is a colon separated list of owner UID, owner GID and
   access mode. E.g. `file_permissions=(["/etc/shadow"]="0:0:400")`. When directories are listed with a trailing backslash ("/") **all** files and directories contained within the listed directory will have the same owner UID, owner GID, and access mode applied recursively.
diff --git a/archiso/mkarchiso b/archiso/mkarchiso
index f9c64ac..b6c5822 100755
--- a/archiso/mkarchiso
+++ b/archiso/mkarchiso
@@ -155,11 +155,6 @@ _cleanup_airootfs() {
 }
 
 _run_mksquashfs() {
-    # Set default mksquashfs options
-    if (( ${#airootfs_image_tool_options[@]} < 1 )); then
-        airootfs_image_tool_options=('-comp' 'xz')
-    fi
-
     local image_path="${isofs_dir}/${install_dir}/${arch}/airootfs.sfs"
     if [[ "${quiet}" == "y" ]]; then
         mksquashfs "$@" "${image_path}" -noappend "${airootfs_image_tool_options[@]}" -no-progress > /dev/null
-- 
cgit v1.2.3-70-g09d2


From 09b6127fe8cabaf9a54a3bb864b0e3e009ca8476 Mon Sep 17 00:00:00 2001
From: nl6720 <nl6720@gmail.com>
Date: Sat, 6 Mar 2021 09:59:22 +0200
Subject: mkarchiso: use -isohybrid-gpt-basdat instead of -appended_part_as_gpt
 for ISOs that will support BIOS booting

Some hardware, like Lenovo Thinkpad T420, will not BIOS boot if the disk has a valid GPT.
See https://bbs.archlinux.org/viewtopic.php?id=264096 .

Instead of a valid GPT, change to a valid MBR and invalid GPT similar to what was used before 729d16b48c99c5d9b23a89123ecde4ecacfa8705. That layout, despite having crazy partition tables, boots everywhere.
The difference is that -append_partition is still kept and specified before -isohybrid-gpt-basdat. Thus the appended partition will be listed as EFI system partition in MBR and as Microsoft basic partition in the invalid GPT.

Fixes #102.
---
 archiso/mkarchiso | 44 +++++++++++++++++++++++++++++++-------------
 1 file changed, 31 insertions(+), 13 deletions(-)

(limited to 'archiso/mkarchiso')

diff --git a/archiso/mkarchiso b/archiso/mkarchiso
index b6c5822..439e8d0 100755
--- a/archiso/mkarchiso
+++ b/archiso/mkarchiso
@@ -681,15 +681,10 @@ _add_xorrisofs_options_bios.syslinux.mbr() {
         '-isohybrid-mbr' "${isofs_dir}/syslinux/isohdpfx.bin"
         # When GPT is used, create an additional partition in the MBR (besides 0xEE) for sectors 0–1 (MBR
         # bootstrap code area) and mark it as bootable
-        # This violates the UEFI specification, but may allow booting on some systems
+        # May allow booting on some systems
         # https://wiki.archlinux.org/index.php/Partitioning#Tricking_old_BIOS_into_booting_from_GPT
         '--mbr-force-bootable'
-        # Set the ISO 9660 partition's type to "Linux filesystem data"
-        # When only MBR is present, the partition type ID will be 0x83 "Linux" as xorriso translates all
-        # GPT partition type GUIDs except for the ESP GUID to MBR type ID 0x83
-        '-iso_mbr_part_type' '0FC63DAF-8483-4772-8E79-3D69D8477DE4'
-        # Move the first partition away from the start of the ISO to match the expectations of partition
-        # editors
+        # Move the first partition away from the start of the ISO to match the expectations of partition editors
         # May allow booting on some systems
         # https://dev.lovelyhq.com/libburnia/libisoburn/src/branch/master/doc/partition_offset.wiki
         '-partition_offset' '16'
@@ -702,12 +697,26 @@ _add_xorrisofs_options_uefi-x64.systemd-boot.esp() {
     # partition will not be mountable
     # shellcheck disable=SC2076
     [[ " ${xorrisofs_options[*]} " =~ ' -partition_offset ' ]] || xorrisofs_options+=('-partition_offset' '16')
-    xorrisofs_options+=(
-        # Attach efiboot.img as a second partition and set its partition type to "EFI system partition"
-        '-append_partition' '2' 'C12A7328-F81F-11D2-BA4B-00A0C93EC93B' "${work_dir}/efiboot.img"
-        # Ensure GPT is used as some systems do not support UEFI booting without it
-        '-appended_part_as_gpt'
-    )
+    # Attach efiboot.img as a second partition and set its partition type to "EFI system partition"
+    xorrisofs_options+=('-append_partition' '2' 'C12A7328-F81F-11D2-BA4B-00A0C93EC93B' "${work_dir}/efiboot.img")
+    # Ensure GPT is used as some systems do not support UEFI booting without it
+    # shellcheck disable=SC2076
+    if [[ " ${bootmodes[*]} " =~ ' bios.syslinux.mbr ' ]]; then
+        # A valid GPT prevents BIOS booting on some systems, instead use an invalid GPT (without a protective MBR).
+        # The attached partition will have the EFI system partition type code in MBR, but in the invalid GPT it will
+        # have a Microsoft basic partition type code.
+        if [[ ! " ${bootmodes[*]} " =~ ' uefi-x64.systemd-boot.eltorito ' ]]; then
+            # If '-isohybrid-gpt-basdat' is specified before '-e', then the appended EFI system partition will have the
+            # EFI system partition type ID/GUID in both MBR and GPT. If '-isohybrid-gpt-basdat' is specified after '-e',
+            # the appended EFI system partition will have the Microsoft basic data type GUID in GPT.
+            if [[ ! " ${xorrisofs_options[*]} " =~ ' -isohybrid-gpt-basdat ' ]]; then
+                xorrisofs_options+=('-isohybrid-gpt-basdat')
+            fi
+        fi
+    else
+        # Use valid GPT if BIOS booting support will not be required
+        xorrisofs_options+=('-appended_part_as_gpt')
+    fi
 }
 
 # systemd-boot via El Torito
@@ -723,6 +732,15 @@ _add_xorrisofs_options_uefi-x64.systemd-boot.eltorito() {
             # Boot image is not emulating floppy or hard disk; required for all known boot loaders
             '-no-emul-boot'
         )
+        # A valid GPT prevents BIOS booting on some systems, use an invalid GPT instead.
+        if [[ " ${bootmodes[*]} " =~ ' bios.syslinux.mbr ' ]]; then
+            # If '-isohybrid-gpt-basdat' is specified before '-e', then the appended EFI system partition will have the
+            # EFI system partition type ID/GUID in both MBR and GPT. If '-isohybrid-gpt-basdat' is specified after '-e',
+            # the appended EFI system partition will have the Microsoft basic data type GUID in GPT.
+            if [[ ! " ${xorrisofs_options[*]} " =~ ' -isohybrid-gpt-basdat ' ]]; then
+                xorrisofs_options+=('-isohybrid-gpt-basdat')
+            fi
+        fi
     else
         # The ISO will not contain a GPT partition table, so to be able to reference efiboot.img, place it as a
         # file inside the ISO 9660 file system
-- 
cgit v1.2.3-70-g09d2


From 1a9710963996e476790d7a351b57b090866c9b71 Mon Sep 17 00:00:00 2001
From: Christian Hesse <mail@eworm.de>
Date: Thu, 1 Apr 2021 14:24:12 +0200
Subject: mkarchiso: also add iso name in grub environment block

---
 README.rst        | 6 +++---
 archiso/mkarchiso | 5 +++--
 2 files changed, 6 insertions(+), 5 deletions(-)

(limited to 'archiso/mkarchiso')

diff --git a/README.rst b/README.rst
index cdbe827..15e361b 100644
--- a/README.rst
+++ b/README.rst
@@ -121,14 +121,14 @@ Optionally install archiso's mkinitcpio hooks:
 Optional Features
 =================
 
-The iso image contains a grub environment block holding the iso version. This allows to boot the iso image from grub
-with a version specific cow directory to mitigate overlay clashes.
+The iso image contains a grub environment block holding the iso name and version. This allows to
+boot the iso image from grub with a version specific cow directory to mitigate overlay clashes.
 
   .. code:: grub
       loopback loop archlinux.iso
       load_env -f (loop)/arch/grubenv
       linux (loop)/arch/boot/x86_64/vmlinuz-linux ... \
-          cow_directory=archlinux/${VERSION} ...
+          cow_directory=${NAME}/${VERSION} ...
       initrd (loop)/arch/boot/x86_64/initramfs-linux-lts.img
 
 Contribute
diff --git a/archiso/mkarchiso b/archiso/mkarchiso
index 439e8d0..f08d8f6 100755
--- a/archiso/mkarchiso
+++ b/archiso/mkarchiso
@@ -937,8 +937,9 @@ _make_version() {
     _msg_info "Creating files with iso version..."
     printf '%s\n' "${iso_version}" > "${airootfs_dir}/version"
     printf '%s\n' "${iso_version}" > "${isofs_dir}/${install_dir}/version"
-    printf '%.1024s' "$(printf '# GRUB Environment Block\nVERSION=%s\n%s' "${iso_version}" \
-        "$(printf '%0.1s' "#"{1..1024})")" > "${isofs_dir}/${install_dir}/grubenv"
+    printf '%.1024s' "$(printf '# GRUB Environment Block\nNAME=%s\nVERSION=%s\n%s' \
+        "${iso_name}" "${iso_version}" "$(printf '%0.1s' "#"{1..1024})")" \
+        > "${isofs_dir}/${install_dir}/grubenv"
     _msg_info "Done!"
 }
 
-- 
cgit v1.2.3-70-g09d2


From 98c7b67697d2376ab37813295a5f352436040c59 Mon Sep 17 00:00:00 2001
From: nl6720 <nl6720@gmail.com>
Date: Thu, 1 Apr 2021 15:06:41 +0300
Subject: mkarchiso: append IMAGE_ID and IMAGE_VERSION to /etc/os-release

This provides the ISO version information in the os-release file.

* IMAGE_ID is set to the value of $iso_name.
* IMAGE_VERSION is set to the value of $iso_version.

Implements #116.
---
 archiso/mkarchiso | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

(limited to 'archiso/mkarchiso')

diff --git a/archiso/mkarchiso b/archiso/mkarchiso
index f08d8f6..e41d67e 100755
--- a/archiso/mkarchiso
+++ b/archiso/mkarchiso
@@ -933,13 +933,29 @@ _export_gpg_publickey() {
 }
 
 _make_version() {
+    local osrelease
     install -d -m 0755 -- "${isofs_dir}/${install_dir}"
     _msg_info "Creating files with iso version..."
+    # Write version file to airootfs
+    rm -f -- "${airootfs_dir}/version"
     printf '%s\n' "${iso_version}" > "${airootfs_dir}/version"
+    # Write version file to ISO 9660
     printf '%s\n' "${iso_version}" > "${isofs_dir}/${install_dir}/version"
+    # Write grubenv with version information to ISO 9660
     printf '%.1024s' "$(printf '# GRUB Environment Block\nNAME=%s\nVERSION=%s\n%s' \
         "${iso_name}" "${iso_version}" "$(printf '%0.1s' "#"{1..1024})")" \
         > "${isofs_dir}/${install_dir}/grubenv"
+    # Append IMAGE_ID & IMAGE_VERSION to os-release
+    osrelease="$(realpath -- "${airootfs_dir}/etc/os-release")"
+    if [[ ! -e "${airootfs_dir}/etc/os-release" && -e "${airootfs_dir}/usr/lib/os-release" ]]; then
+        osrelease="$(realpath -- "${airootfs_dir}/usr/lib/os-release")"
+    fi
+    if [[ "${osrelease}" != "${airootfs_dir}"* ]]; then
+        _msg_warning "os-release file '${osrelease}' is outside of valid path."
+    else
+        [[ ! -e "${osrelease}" ]] || sed -i '/^IMAGE_ID=/d;/^IMAGE_VERSION=/d' "${osrelease}"
+        printf 'IMAGE_ID=%s\nIMAGE_VERSION=%s\n' "${iso_name}" "${iso_version}" >> "${osrelease}"
+    fi
     _msg_info "Done!"
 }
 
-- 
cgit v1.2.3-70-g09d2


From a771297e12f77f4aeffa2303b33ffc7d7bbf1e3d Mon Sep 17 00:00:00 2001
From: nl6720 <nl6720@gmail.com>
Date: Tue, 27 Apr 2021 13:45:17 +0300
Subject: mkarchiso: make sure to remove potentially preexisting files from
 $airootfs_dir before creating them with output redirection

mkarchiso creates "${airootfs_dir}/etc/machine-id" by using output redirection. If this file is an existing symlink, then the printf output would be written to the symlink target. It can be a big issue in case the symlink resolves to a path outside ${airootfs_dir}.

Fixes #121.
---
 archiso/mkarchiso | 1 +
 1 file changed, 1 insertion(+)

(limited to 'archiso/mkarchiso')

diff --git a/archiso/mkarchiso b/archiso/mkarchiso
index e41d67e..410db80 100755
--- a/archiso/mkarchiso
+++ b/archiso/mkarchiso
@@ -149,6 +149,7 @@ _cleanup_airootfs() {
     # Delete package pacman related files.
     find "${work_dir}" \( -name '*.pacnew' -o -name '*.pacsave' -o -name '*.pacorig' \) -delete
     # Create an empty /etc/machine-id
+    rm -f -- "${airootfs_dir}/etc/machine-id"
     printf '' > "${airootfs_dir}/etc/machine-id"
 
     _msg_info "Done!"
-- 
cgit v1.2.3-70-g09d2


From 0406f9ca021ff833bf4e6591871d683b4f04727c Mon Sep 17 00:00:00 2001
From: nl6720 <nl6720@gmail.com>
Date: Tue, 27 Apr 2021 13:03:29 +0300
Subject: mkarchiso: create reproducible gzip archives

Use the gzip option -n/--no-name to prevent saving the original file name and timestamp.

Fixes #104.
---
 archiso/mkarchiso | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'archiso/mkarchiso')

diff --git a/archiso/mkarchiso b/archiso/mkarchiso
index 410db80..939a7a3 100755
--- a/archiso/mkarchiso
+++ b/archiso/mkarchiso
@@ -413,10 +413,10 @@ _make_bootmode_bios.syslinux.mbr() {
     if [[ -e "${isofs_dir}/syslinux/hdt.c32" ]]; then
         install -d -m 0755 -- "${isofs_dir}/syslinux/hdt"
         if [[ -e "${airootfs_dir}/usr/share/hwdata/pci.ids" ]]; then
-            gzip -c -9 "${airootfs_dir}/usr/share/hwdata/pci.ids" > \
+            gzip -cn9 "${airootfs_dir}/usr/share/hwdata/pci.ids" > \
                 "${isofs_dir}/syslinux/hdt/pciids.gz"
         fi
-        find "${airootfs_dir}/usr/lib/modules" -name 'modules.alias' -print -exec gzip -c -9 '{}' ';' -quit > \
+        find "${airootfs_dir}/usr/lib/modules" -name 'modules.alias' -print -exec gzip -cn9 '{}' ';' -quit > \
             "${isofs_dir}/syslinux/hdt/modalias.gz"
     fi
 
-- 
cgit v1.2.3-70-g09d2


From cc735dbbfc79e14548db7378a85380dfbf3513ff Mon Sep 17 00:00:00 2001
From: David Runge <dvzrv@archlinux.org>
Date: Sat, 1 May 2021 16:51:28 +0200
Subject: Force PGP signature file extension

archiso/mkarchiso:
Force the file extension in use for the PGP signatures of the rootfs to always be .sig.
When gnupg's 'armor' configuration option is used, the output otherwise defaults to using .asc.
As the verification hook in mkinitcpio-archiso expects the .sig file extension, verifying the rootfs will fail in that
scenario.
---
 archiso/mkarchiso | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'archiso/mkarchiso')

diff --git a/archiso/mkarchiso b/archiso/mkarchiso
index 939a7a3..f4af2ad 100755
--- a/archiso/mkarchiso
+++ b/archiso/mkarchiso
@@ -227,10 +227,11 @@ _mkchecksum() {
 _mksignature() {
     _msg_info "Signing SquashFS image..."
     cd -- "${isofs_dir}/${install_dir}/${arch}"
+    # always use the .sig file extension, as that is what mkinitcpio-archiso's hooks expect
     if [[ -e "${isofs_dir}/${install_dir}/${arch}/airootfs.sfs" ]]; then
-        gpg --detach-sign --default-key "${gpg_key}" airootfs.sfs
+        gpg --output airootfs.sfs.sig --detach-sign --default-key "${gpg_key}" airootfs.sfs
     elif [[ -e "${isofs_dir}/${install_dir}/${arch}/airootfs.erofs" ]]; then
-        gpg --detach-sign --default-key "${gpg_key}" airootfs.erofs
+        gpg --output airootfs.erofs.sig --detach-sign --default-key "${gpg_key}" airootfs.erofs
     fi
     cd -- "${OLDPWD}"
     _msg_info "Done!"
-- 
cgit v1.2.3-70-g09d2


From 42cdf8674a43c9ad5b69e3ddb6638cfb07633b9e Mon Sep 17 00:00:00 2001
From: David Runge <dvzrv@archlinux.org>
Date: Sat, 1 May 2021 17:16:56 +0200
Subject: Set more generic output for signatures

archiso/mkarchiso:
Change the help output to reflect that the `-g` option is generically signing a rootfs (which may be e.g. squashfs or
erofs).
Change the output of `_mksignature()` to be more generic, as it signs any type of understood rootfs image (which may be
e.g. squashfs or erofs).
---
 archiso/mkarchiso | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'archiso/mkarchiso')

diff --git a/archiso/mkarchiso b/archiso/mkarchiso
index f4af2ad..aaf8325 100755
--- a/archiso/mkarchiso
+++ b/archiso/mkarchiso
@@ -93,7 +93,7 @@ usage: ${app_name} [options] <profile_dir>
                       Default: '${iso_label}'
      -P <publisher>   Set the ISO publisher
                       Default: '${iso_publisher}'
-     -g <gpg_key>     Set the GPG key to be used for signing the sqashfs image
+     -g <gpg_key>     Set the PGP key ID to be used for signing the rootfs image
      -h               This message
      -o <out_dir>     Set the output directory
                       Default: '${out_dir}'
@@ -225,7 +225,7 @@ _mkchecksum() {
 }
 
 _mksignature() {
-    _msg_info "Signing SquashFS image..."
+    _msg_info "Signing rootfs image..."
     cd -- "${isofs_dir}/${install_dir}/${arch}"
     # always use the .sig file extension, as that is what mkinitcpio-archiso's hooks expect
     if [[ -e "${isofs_dir}/${install_dir}/${arch}/airootfs.sfs" ]]; then
-- 
cgit v1.2.3-70-g09d2


From 2cac53967b99a497914c001ddeeb9b72d090b5d4 Mon Sep 17 00:00:00 2001
From: David Runge <dvzrv@archlinux.org>
Date: Sun, 2 May 2021 18:58:47 +0200
Subject: mkarchiso: Implement buildmodes that allow building bootstrap images

archiso/mkarchiso:
Introduce a buildmodes array, that can be used to build towards more than one output artifact type.
Add a buildmode for building a bootstrap image (a compressed file containing a very minimal Arch installation).
The buildmodes can be set either using a `buildmodes` array in a `profiledef.sh` or by using the `-m` option flag to
mkarchiso and providing a space delimited, quoted list.
The 'iso' buildmode is always the default if no buildmodes are setup.
Implement building a bootstrap image, when using the 'bootstrap' `buildmode`, which uses a profile's
'bootstrap_packages.$arch' file to install packages using pacstrap and compressing it to a bootstrap image.
The name of the output file is currently constructed from the `iso_name` value by appending `-bootstrap`.

Replace the uses of `airootfs_dir` with the more generic `pacstrap_dir`, as the location denotes where pacstrap is
being used.
Replace uses of `img_name` with `image_name` and removing it from the global scope, so that it can be overridden per
each buildmode.
Rename `_cleanup_airootfs_dir()` to `_cleanup_pacstrap_dir()`.
Make `_run_once()` more generic by prepending the state files with a string defined by `run_once_mode`.
Add `_validate_requirements_buildmode_all()`, `_validate_requirements_buildmode_bootstrap()` and
`_validate_requirements_buildmode_iso()` to validate the general requirements of the different buildmodes.
Add `_build_bootstrap_image()` to generate the bootstrap image using bsdtar.
Rename `_build_iso()` to `_build_iso_image()` to fit the naming of the respective bootstrap function.
Extend `_read_profile()` to include the reading of bootstrap image specific packages from a file.
Extend `_validate_options()` to include testing of the bootstrap packages and running of validation functions for all
buildmodes.
Change `_set_overrides()` to override the buildmodes if they are specified via the `-m` option flag.
Change `_make_version()` to be used generically in all buildmodes.
Change `_make_pkglist()` to be used generically in all buildmodes.
Rename `_build_profile()` to `_build_buildmode_iso()` and set local variables that are specific to the buildmode, such
as `image_name`, `pacstrap_dir`, `run_once_mode` , `buildmode_packages` and `buildmode_pkg_list`.
Add `_build_buildmode_bootstrap()` and set local variables that are specific to the buildmode, such as `image_name`,
`pacstrap_dir`, `run_once_mode` , `buildmode_packages` and `buildmode_pkg_list`.
Add the `-m` option flag to the list of flags.

Closes #127
---
 archiso/mkarchiso | 393 +++++++++++++++++++++++++++++++++++++-----------------
 1 file changed, 272 insertions(+), 121 deletions(-)

(limited to 'archiso/mkarchiso')

diff --git a/archiso/mkarchiso b/archiso/mkarchiso
index aaf8325..683f90e 100755
--- a/archiso/mkarchiso
+++ b/archiso/mkarchiso
@@ -14,10 +14,10 @@ app_name="${0##*/}"
 
 # Define global variables. All of them will be overwritten later
 pkg_list=()
+bootstrap_pkg_list=()
 quiet=""
 work_dir=""
 out_dir=""
-img_name=""
 gpg_key=""
 iso_name=""
 iso_label=""
@@ -28,6 +28,9 @@ install_dir=""
 arch=""
 pacman_conf=""
 packages=""
+bootstrap_packages=""
+pacstrap_dir=""
+buildmodes=()
 bootmodes=()
 airootfs_image_type=""
 airootfs_image_tool_options=()
@@ -63,8 +66,8 @@ _msg_error() {
 _mount_airootfs() {
     trap "_umount_airootfs" EXIT HUP INT TERM
     install -d -m 0755 -- "${work_dir}/mnt/airootfs"
-    _msg_info "Mounting '${airootfs_dir}.img' on '${work_dir}/mnt/airootfs'..."
-    mount -- "${airootfs_dir}.img" "${work_dir}/mnt/airootfs"
+    _msg_info "Mounting '${pacstrap_dir}.img' on '${work_dir}/mnt/airootfs'..."
+    mount -- "${pacstrap_dir}.img" "${work_dir}/mnt/airootfs"
     _msg_info "Done!"
 }
 
@@ -95,6 +98,8 @@ usage: ${app_name} [options] <profile_dir>
                       Default: '${iso_publisher}'
      -g <gpg_key>     Set the PGP key ID to be used for signing the rootfs image
      -h               This message
+     -m [build modes] Build modes to use (valid modes are: 'bootstrap' and 'iso').
+                      Multiple build modes are provided as quoted, space delimited list.
      -o <out_dir>     Set the output directory
                       Default: '${out_dir}'
      -p PACKAGE(S)    Package(s) to install.
@@ -119,38 +124,41 @@ _show_config() {
     _msg_info "   Installation directory:   ${install_dir}"
     _msg_info "               Build date:   ${build_date}"
     _msg_info "         Output directory:   ${out_dir}"
+    _msg_info "       Current build mode:   ${buildmode}"
+    _msg_info "              Build modes:   ${buildmodes[*]}"
     _msg_info "                  GPG key:   ${gpg_key:-None}"
     _msg_info "                  Profile:   ${profile}"
     _msg_info "Pacman configuration file:   ${pacman_conf}"
-    _msg_info "          Image file name:   ${img_name}"
+    _msg_info "          Image file name:   ${image_name:-None}"
     _msg_info "         ISO volume label:   ${iso_label}"
     _msg_info "            ISO publisher:   ${iso_publisher}"
     _msg_info "          ISO application:   ${iso_application}"
     _msg_info "               Boot modes:   ${bootmodes[*]}"
-    _msg_info "                 Packages:   ${pkg_list[*]}"
+    _msg_info "            Packages File:   ${buildmode_packages}"
+    _msg_info "                 Packages:   ${buildmode_pkg_list[*]}"
 }
 
 # Cleanup airootfs
-_cleanup_airootfs() {
-    _msg_info "Cleaning up what we can on airootfs..."
+_cleanup_pacstrap_dir() {
+    _msg_info "Cleaning up in pacstrap location..."
 
     # Delete all files in /boot
-    [[ -d "${airootfs_dir}/boot" ]] && find "${airootfs_dir}/boot" -mindepth 1 -delete
+    [[ -d "${pacstrap_dir}/boot" ]] && find "${pacstrap_dir}/boot" -mindepth 1 -delete
     # Delete pacman database sync cache files (*.tar.gz)
-    [[ -d "${airootfs_dir}/var/lib/pacman" ]] && find "${airootfs_dir}/var/lib/pacman" -maxdepth 1 -type f -delete
+    [[ -d "${pacstrap_dir}/var/lib/pacman" ]] && find "${pacstrap_dir}/var/lib/pacman" -maxdepth 1 -type f -delete
     # Delete pacman database sync cache
-    [[ -d "${airootfs_dir}/var/lib/pacman/sync" ]] && find "${airootfs_dir}/var/lib/pacman/sync" -delete
+    [[ -d "${pacstrap_dir}/var/lib/pacman/sync" ]] && find "${pacstrap_dir}/var/lib/pacman/sync" -delete
     # Delete pacman package cache
-    [[ -d "${airootfs_dir}/var/cache/pacman/pkg" ]] && find "${airootfs_dir}/var/cache/pacman/pkg" -type f -delete
+    [[ -d "${pacstrap_dir}/var/cache/pacman/pkg" ]] && find "${pacstrap_dir}/var/cache/pacman/pkg" -type f -delete
     # Delete all log files, keeps empty dirs.
-    [[ -d "${airootfs_dir}/var/log" ]] && find "${airootfs_dir}/var/log" -type f -delete
+    [[ -d "${pacstrap_dir}/var/log" ]] && find "${pacstrap_dir}/var/log" -type f -delete
     # Delete all temporary files and dirs
-    [[ -d "${airootfs_dir}/var/tmp" ]] && find "${airootfs_dir}/var/tmp" -mindepth 1 -delete
+    [[ -d "${pacstrap_dir}/var/tmp" ]] && find "${pacstrap_dir}/var/tmp" -mindepth 1 -delete
     # Delete package pacman related files.
     find "${work_dir}" \( -name '*.pacnew' -o -name '*.pacsave' -o -name '*.pacorig' \) -delete
     # Create an empty /etc/machine-id
-    rm -f -- "${airootfs_dir}/etc/machine-id"
-    printf '' > "${airootfs_dir}/etc/machine-id"
+    rm -f -- "${pacstrap_dir}/etc/machine-id"
+    printf '' > "${pacstrap_dir}/etc/machine-id"
 
     _msg_info "Done!"
 }
@@ -166,49 +174,49 @@ _run_mksquashfs() {
 
 # Makes a ext4 filesystem inside a SquashFS from a source directory.
 _mkairootfs_ext4+squashfs() {
-    [[ -e "${airootfs_dir}" ]] || _msg_error "The path '${airootfs_dir}' does not exist" 1
+    [[ -e "${pacstrap_dir}" ]] || _msg_error "The path '${pacstrap_dir}' does not exist" 1
 
     _msg_info "Creating ext4 image of 32 GiB..."
     if [[ "${quiet}" == "y" ]]; then
-        mkfs.ext4 -q -O '^has_journal,^resize_inode' -E 'lazy_itable_init=0' -m 0 -F -- "${airootfs_dir}.img" 32G
+        mkfs.ext4 -q -O '^has_journal,^resize_inode' -E 'lazy_itable_init=0' -m 0 -F -- "${pacstrap_dir}.img" 32G
     else
-        mkfs.ext4 -O '^has_journal,^resize_inode' -E 'lazy_itable_init=0' -m 0 -F -- "${airootfs_dir}.img" 32G
+        mkfs.ext4 -O '^has_journal,^resize_inode' -E 'lazy_itable_init=0' -m 0 -F -- "${pacstrap_dir}.img" 32G
     fi
-    tune2fs -c 0 -i 0 -- "${airootfs_dir}.img" > /dev/null
+    tune2fs -c 0 -i 0 -- "${pacstrap_dir}.img" > /dev/null
     _msg_info "Done!"
     _mount_airootfs
-    _msg_info "Copying '${airootfs_dir}/' to '${work_dir}/mnt/airootfs/'..."
-    cp -aT -- "${airootfs_dir}/" "${work_dir}/mnt/airootfs/"
+    _msg_info "Copying '${pacstrap_dir}/' to '${work_dir}/mnt/airootfs/'..."
+    cp -aT -- "${pacstrap_dir}/" "${work_dir}/mnt/airootfs/"
     chown -- 0:0 "${work_dir}/mnt/airootfs/"
     _msg_info "Done!"
     _umount_airootfs
     install -d -m 0755 -- "${isofs_dir}/${install_dir}/${arch}"
     _msg_info "Creating SquashFS image, this may take some time..."
-    _run_mksquashfs "${airootfs_dir}.img"
+    _run_mksquashfs "${pacstrap_dir}.img"
     _msg_info "Done!"
-    rm -- "${airootfs_dir}.img"
+    rm -- "${pacstrap_dir}.img"
 }
 
 # Makes a SquashFS filesystem from a source directory.
 _mkairootfs_squashfs() {
-    [[ -e "${airootfs_dir}" ]] || _msg_error "The path '${airootfs_dir}' does not exist" 1
+    [[ -e "${pacstrap_dir}" ]] || _msg_error "The path '${pacstrap_dir}' does not exist" 1
 
     install -d -m 0755 -- "${isofs_dir}/${install_dir}/${arch}"
     _msg_info "Creating SquashFS image, this may take some time..."
-    _run_mksquashfs "${airootfs_dir}"
+    _run_mksquashfs "${pacstrap_dir}"
 }
 
 # Makes an EROFS file system from a source directory.
 _mkairootfs_erofs() {
     local fsuuid
-    [[ -e "${airootfs_dir}" ]] || _msg_error "The path '${airootfs_dir}' does not exist" 1
+    [[ -e "${pacstrap_dir}" ]] || _msg_error "The path '${pacstrap_dir}' does not exist" 1
 
     install -d -m 0755 -- "${isofs_dir}/${install_dir}/${arch}"
     local image_path="${isofs_dir}/${install_dir}/${arch}/airootfs.erofs"
     # Generate reproducible file system UUID from SOURCE_DATE_EPOCH
     fsuuid="$(uuidgen --sha1 --namespace 93a870ff-8565-4cf3-a67b-f47299271a96 --name "${SOURCE_DATE_EPOCH}")"
     _msg_info "Creating EROFS image, this may take some time..."
-    mkfs.erofs -U "${fsuuid}" "${airootfs_image_tool_options[@]}" -- "${image_path}" "${airootfs_dir}"
+    mkfs.erofs -U "${fsuuid}" "${airootfs_image_tool_options[@]}" -- "${image_path}" "${pacstrap_dir}"
     _msg_info "Done!"
 }
 
@@ -239,9 +247,9 @@ _mksignature() {
 
 # Helper function to run functions only one time.
 _run_once() {
-    if [[ ! -e "${work_dir}/build.${1}" ]]; then
+    if [[ ! -e "${work_dir}/${run_once_mode}.${1}" ]]; then
         "$1"
-        touch "${work_dir}/build.${1}"
+        touch "${work_dir}/${run_once_mode}.${1}"
     fi
 }
 
@@ -267,7 +275,7 @@ _make_pacman_conf() {
     # see `man 8 pacman` for further info
     pacman-conf --config "${pacman_conf}" | \
         sed "/CacheDir/d;/DBPath/d;/HookDir/d;/LogFile/d;/RootDir/d;/\[options\]/a CacheDir = ${_cache_dirs}
-        /\[options\]/a HookDir = ${airootfs_dir}/etc/pacman.d/hooks/" > "${work_dir}/pacman.conf"
+        /\[options\]/a HookDir = ${pacstrap_dir}/etc/pacman.d/hooks/" > "${work_dir}/${buildmode}.pacman.conf"
 }
 
 # Prepare working directory and copy custom airootfs files (airootfs)
@@ -275,27 +283,27 @@ _make_custom_airootfs() {
     local passwd=()
     local filename permissions
 
-    install -d -m 0755 -o 0 -g 0 -- "${airootfs_dir}"
+    install -d -m 0755 -o 0 -g 0 -- "${pacstrap_dir}"
 
     if [[ -d "${profile}/airootfs" ]]; then
         _msg_info "Copying custom airootfs files..."
-        cp -af --no-preserve=ownership,mode -- "${profile}/airootfs/." "${airootfs_dir}"
+        cp -af --no-preserve=ownership,mode -- "${profile}/airootfs/." "${pacstrap_dir}"
         # Set ownership and mode for files and directories
         for filename in "${!file_permissions[@]}"; do
             IFS=':' read -ra permissions <<< "${file_permissions["${filename}"]}"
-            # Prevent file path traversal outside of $airootfs_dir
-            if [[ "$(realpath -q -- "${airootfs_dir}${filename}")" != "${airootfs_dir}"* ]]; then
-                _msg_error "Failed to set permissions on '${airootfs_dir}${filename}'. Outside of valid path." 1
+            # Prevent file path traversal outside of $pacstrap_dir
+            if [[ "$(realpath -q -- "${pacstrap_dir}${filename}")" != "${pacstrap_dir}"* ]]; then
+                _msg_error "Failed to set permissions on '${pacstrap_dir}${filename}'. Outside of valid path." 1
             # Warn if the file does not exist
-            elif [[ ! -e "${airootfs_dir}${filename}" ]]; then
-                _msg_warning "Cannot change permissions of '${airootfs_dir}${filename}'. The file or directory does not exist."
+            elif [[ ! -e "${pacstrap_dir}${filename}" ]]; then
+                _msg_warning "Cannot change permissions of '${pacstrap_dir}${filename}'. The file or directory does not exist."
             else
                 if [[ "${filename: -1}" == "/" ]]; then
-                    chown -fhR -- "${permissions[0]}:${permissions[1]}" "${airootfs_dir}${filename}"
-                    chmod -fR -- "${permissions[2]}" "${airootfs_dir}${filename}"
+                    chown -fhR -- "${permissions[0]}:${permissions[1]}" "${pacstrap_dir}${filename}"
+                    chmod -fR -- "${permissions[2]}" "${pacstrap_dir}${filename}"
                 else
-                    chown -fh -- "${permissions[0]}:${permissions[1]}" "${airootfs_dir}${filename}"
-                    chmod -f -- "${permissions[2]}" "${airootfs_dir}${filename}"
+                    chown -fh -- "${permissions[0]}:${permissions[1]}" "${pacstrap_dir}${filename}"
+                    chmod -f -- "${permissions[2]}" "${pacstrap_dir}${filename}"
                 fi
             fi
         done
@@ -305,7 +313,7 @@ _make_custom_airootfs() {
 
 # Install desired packages to airootfs
 _make_packages() {
-    _msg_info "Installing packages to '${airootfs_dir}/'..."
+    _msg_info "Installing packages to '${pacstrap_dir}/'..."
 
     if [[ -n "${gpg_key}" ]]; then
         exec {ARCHISO_GNUPG_FD}<>"${work_dir}/pubkey.gpg"
@@ -313,9 +321,9 @@ _make_packages() {
     fi
 
     if [[ "${quiet}" = "y" ]]; then
-        pacstrap -C "${work_dir}/pacman.conf" -c -G -M -- "${airootfs_dir}" "${pkg_list[@]}" &> /dev/null
+        pacstrap -C "${work_dir}/${buildmode}.pacman.conf" -c -G -M -- "${pacstrap_dir}" "${buildmode_pkg_list[@]}" &> /dev/null
     else
-        pacstrap -C "${work_dir}/pacman.conf" -c -G -M -- "${airootfs_dir}" "${pkg_list[@]}"
+        pacstrap -C "${work_dir}/${buildmode}.pacman.conf" -c -G -M -- "${pacstrap_dir}" "${buildmode_pkg_list[@]}"
     fi
 
     if [[ -n "${gpg_key}" ]]; then
@@ -338,27 +346,27 @@ _make_customize_airootfs() {
             # Skip invalid home directories
             [[ "${passwd[5]}" == '/' ]] && continue
             [[ -z "${passwd[5]}" ]] && continue
-            # Prevent path traversal outside of $airootfs_dir
-            if [[ "$(realpath -q -- "${airootfs_dir}${passwd[5]}")" == "${airootfs_dir}"* ]]; then
-                if [[ ! -d "${airootfs_dir}${passwd[5]}" ]]; then
-                    install -d -m 0750 -o "${passwd[2]}" -g "${passwd[3]}" -- "${airootfs_dir}${passwd[5]}"
+            # Prevent path traversal outside of $pacstrap_dir
+            if [[ "$(realpath -q -- "${pacstrap_dir}${passwd[5]}")" == "${pacstrap_dir}"* ]]; then
+                if [[ ! -d "${pacstrap_dir}${passwd[5]}" ]]; then
+                    install -d -m 0750 -o "${passwd[2]}" -g "${passwd[3]}" -- "${pacstrap_dir}${passwd[5]}"
                 fi
-                cp -dnRT --preserve=mode,timestamps,links -- "${airootfs_dir}/etc/skel/." "${airootfs_dir}${passwd[5]}"
-                chmod -f 0750 -- "${airootfs_dir}${passwd[5]}"
-                chown -hR -- "${passwd[2]}:${passwd[3]}" "${airootfs_dir}${passwd[5]}"
+                cp -dnRT --preserve=mode,timestamps,links -- "${pacstrap_dir}/etc/skel/." "${pacstrap_dir}${passwd[5]}"
+                chmod -f 0750 -- "${pacstrap_dir}${passwd[5]}"
+                chown -hR -- "${passwd[2]}:${passwd[3]}" "${pacstrap_dir}${passwd[5]}"
             else
-                _msg_error "Failed to set permissions on '${airootfs_dir}${passwd[5]}'. Outside of valid path." 1
+                _msg_error "Failed to set permissions on '${pacstrap_dir}${passwd[5]}'. Outside of valid path." 1
             fi
         done < "${profile}/airootfs/etc/passwd"
         _msg_info "Done!"
     fi
 
-    if [[ -e "${airootfs_dir}/root/customize_airootfs.sh" ]]; then
-        _msg_info "Running customize_airootfs.sh in '${airootfs_dir}' chroot..."
+    if [[ -e "${pacstrap_dir}/root/customize_airootfs.sh" ]]; then
+        _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 "${airootfs_dir}/root/customize_airootfs.sh"
-        eval -- arch-chroot "${airootfs_dir}" "/root/customize_airootfs.sh"
-        rm -- "${airootfs_dir}/root/customize_airootfs.sh"
+        chmod -f -- +x "${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
 }
@@ -376,15 +384,15 @@ _make_boot_on_iso9660() {
     local ucode_image
     _msg_info "Preparing kernel and initramfs for the ISO 9660 file system..."
     install -d -m 0755 -- "${isofs_dir}/${install_dir}/boot/${arch}"
-    install -m 0644 -- "${airootfs_dir}/boot/initramfs-"*".img" "${isofs_dir}/${install_dir}/boot/${arch}/"
-    install -m 0644 -- "${airootfs_dir}/boot/vmlinuz-"* "${isofs_dir}/${install_dir}/boot/${arch}/"
+    install -m 0644 -- "${pacstrap_dir}/boot/initramfs-"*".img" "${isofs_dir}/${install_dir}/boot/${arch}/"
+    install -m 0644 -- "${pacstrap_dir}/boot/vmlinuz-"* "${isofs_dir}/${install_dir}/boot/${arch}/"
 
     for ucode_image in {intel-uc.img,intel-ucode.img,amd-uc.img,amd-ucode.img,early_ucode.cpio,microcode.cpio}; do
-        if [[ -e "${airootfs_dir}/boot/${ucode_image}" ]]; then
-            install -m 0644 -- "${airootfs_dir}/boot/${ucode_image}" "${isofs_dir}/${install_dir}/boot/"
-            if [[ -e "${airootfs_dir}/usr/share/licenses/${ucode_image%.*}/" ]]; then
+        if [[ -e "${pacstrap_dir}/boot/${ucode_image}" ]]; then
+            install -m 0644 -- "${pacstrap_dir}/boot/${ucode_image}" "${isofs_dir}/${install_dir}/boot/"
+            if [[ -e "${pacstrap_dir}/usr/share/licenses/${ucode_image%.*}/" ]]; then
                 install -d -m 0755 -- "${isofs_dir}/${install_dir}/boot/licenses/${ucode_image%.*}/"
-                install -m 0644 -- "${airootfs_dir}/usr/share/licenses/${ucode_image%.*}/"* \
+                install -m 0644 -- "${pacstrap_dir}/usr/share/licenses/${ucode_image%.*}/"* \
                     "${isofs_dir}/${install_dir}/boot/licenses/${ucode_image%.*}/"
             fi
         fi
@@ -405,28 +413,28 @@ _make_bootmode_bios.syslinux.mbr() {
     if [[ -e "${profile}/syslinux/splash.png" ]]; then
         install -m 0644 -- "${profile}/syslinux/splash.png" "${isofs_dir}/syslinux/"
     fi
-    install -m 0644 -- "${airootfs_dir}/usr/lib/syslinux/bios/"*.c32 "${isofs_dir}/syslinux/"
-    install -m 0644 -- "${airootfs_dir}/usr/lib/syslinux/bios/lpxelinux.0" "${isofs_dir}/syslinux/"
-    install -m 0644 -- "${airootfs_dir}/usr/lib/syslinux/bios/memdisk" "${isofs_dir}/syslinux/"
+    install -m 0644 -- "${pacstrap_dir}/usr/lib/syslinux/bios/"*.c32 "${isofs_dir}/syslinux/"
+    install -m 0644 -- "${pacstrap_dir}/usr/lib/syslinux/bios/lpxelinux.0" "${isofs_dir}/syslinux/"
+    install -m 0644 -- "${pacstrap_dir}/usr/lib/syslinux/bios/memdisk" "${isofs_dir}/syslinux/"
 
     _run_once _make_boot_on_iso9660
 
     if [[ -e "${isofs_dir}/syslinux/hdt.c32" ]]; then
         install -d -m 0755 -- "${isofs_dir}/syslinux/hdt"
-        if [[ -e "${airootfs_dir}/usr/share/hwdata/pci.ids" ]]; then
-            gzip -cn9 "${airootfs_dir}/usr/share/hwdata/pci.ids" > \
+        if [[ -e "${pacstrap_dir}/usr/share/hwdata/pci.ids" ]]; then
+            gzip -cn9 "${pacstrap_dir}/usr/share/hwdata/pci.ids" > \
                 "${isofs_dir}/syslinux/hdt/pciids.gz"
         fi
-        find "${airootfs_dir}/usr/lib/modules" -name 'modules.alias' -print -exec gzip -cn9 '{}' ';' -quit > \
+        find "${pacstrap_dir}/usr/lib/modules" -name 'modules.alias' -print -exec gzip -cn9 '{}' ';' -quit > \
             "${isofs_dir}/syslinux/hdt/modalias.gz"
     fi
 
     # Add other aditional/extra files to ${install_dir}/boot/
-    if [[ -e "${airootfs_dir}/boot/memtest86+/memtest.bin" ]]; then
+    if [[ -e "${pacstrap_dir}/boot/memtest86+/memtest.bin" ]]; then
         # rename for PXE: https://wiki.archlinux.org/index.php/Syslinux#Using_memtest
-        install -m 0644 -- "${airootfs_dir}/boot/memtest86+/memtest.bin" "${isofs_dir}/${install_dir}/boot/memtest"
+        install -m 0644 -- "${pacstrap_dir}/boot/memtest86+/memtest.bin" "${isofs_dir}/${install_dir}/boot/memtest"
         install -d -m 0755 -- "${isofs_dir}/${install_dir}/boot/licenses/memtest86+/"
-        install -m 0644 -- "${airootfs_dir}/usr/share/licenses/common/GPL2/license.txt" \
+        install -m 0644 -- "${pacstrap_dir}/usr/share/licenses/common/GPL2/license.txt" \
             "${isofs_dir}/${install_dir}/boot/licenses/memtest86+/"
     fi
     _msg_info "Done! SYSLINUX set up for BIOS booting from a disk successfully."
@@ -436,8 +444,8 @@ _make_bootmode_bios.syslinux.mbr() {
 _make_bootmode_bios.syslinux.eltorito() {
     _msg_info "Setting up SYSLINUX for BIOS booting from an optical disc..."
     install -d -m 0755 -- "${isofs_dir}/syslinux"
-    install -m 0644 -- "${airootfs_dir}/usr/lib/syslinux/bios/isolinux.bin" "${isofs_dir}/syslinux/"
-    install -m 0644 -- "${airootfs_dir}/usr/lib/syslinux/bios/isohdpfx.bin" "${isofs_dir}/syslinux/"
+    install -m 0644 -- "${pacstrap_dir}/usr/lib/syslinux/bios/isolinux.bin" "${isofs_dir}/syslinux/"
+    install -m 0644 -- "${pacstrap_dir}/usr/lib/syslinux/bios/isohdpfx.bin" "${isofs_dir}/syslinux/"
 
     # ISOLINUX and SYSLINUX installation is shared
     _run_once _make_bootmode_bios.syslinux.mbr
@@ -449,7 +457,7 @@ _make_bootmode_bios.syslinux.eltorito() {
 _make_efi_dir_on_iso9660() {
     _msg_info "Preparing an /EFI directory for the ISO 9660 file system..."
     install -d -m 0755 -- "${isofs_dir}/EFI/BOOT"
-    install -m 0644 -- "${airootfs_dir}/usr/lib/systemd/boot/efi/systemd-bootx64.efi" \
+    install -m 0644 -- "${pacstrap_dir}/usr/lib/systemd/boot/efi/systemd-bootx64.efi" \
         "${isofs_dir}/EFI/BOOT/BOOTx64.EFI"
 
     install -d -m 0755 -- "${isofs_dir}/loader/entries"
@@ -464,8 +472,8 @@ _make_efi_dir_on_iso9660() {
 
     # edk2-shell based UEFI shell
     # shellx64.efi is picked up automatically when on /
-    if [[ -e "${airootfs_dir}/usr/share/edk2-shell/x64/Shell_Full.efi" ]]; then
-        install -m 0644 -- "${airootfs_dir}/usr/share/edk2-shell/x64/Shell_Full.efi" "${isofs_dir}/shellx64.efi"
+    if [[ -e "${pacstrap_dir}/usr/share/edk2-shell/x64/Shell_Full.efi" ]]; then
+        install -m 0644 -- "${pacstrap_dir}/usr/share/edk2-shell/x64/Shell_Full.efi" "${isofs_dir}/shellx64.efi"
     fi
     _msg_info "Done!"
 }
@@ -476,10 +484,10 @@ _make_boot_on_fat() {
     _msg_info "Preparing kernel and initramfs for the FAT file system..."
     mmd -i "${work_dir}/efiboot.img" \
         "::/${install_dir}" "::/${install_dir}/boot" "::/${install_dir}/boot/${arch}"
-    mcopy -i "${work_dir}/efiboot.img" "${airootfs_dir}/boot/vmlinuz-"* \
-        "${airootfs_dir}/boot/initramfs-"*".img" "::/${install_dir}/boot/${arch}/"
+    mcopy -i "${work_dir}/efiboot.img" "${pacstrap_dir}/boot/vmlinuz-"* \
+        "${pacstrap_dir}/boot/initramfs-"*".img" "::/${install_dir}/boot/${arch}/"
     for ucode_image in \
-        "${airootfs_dir}/boot/"{intel-uc.img,intel-ucode.img,amd-uc.img,amd-ucode.img,early_ucode.cpio,microcode.cpio}
+        "${pacstrap_dir}/boot/"{intel-uc.img,intel-ucode.img,amd-uc.img,amd-ucode.img,early_ucode.cpio,microcode.cpio}
     do
         if [[ -e "${ucode_image}" ]]; then
             all_ucode_images+=("${ucode_image}")
@@ -498,12 +506,12 @@ _make_bootmode_uefi-x64.systemd-boot.esp() {
 
     # the required image size in KiB (rounded up to the next full MiB with an additional MiB for reserved sectors)
     efiboot_imgsize="$(du -bc \
-        "${airootfs_dir}/usr/lib/systemd/boot/efi/systemd-bootx64.efi" \
-        "${airootfs_dir}/usr/share/edk2-shell/x64/Shell_Full.efi" \
+        "${pacstrap_dir}/usr/lib/systemd/boot/efi/systemd-bootx64.efi" \
+        "${pacstrap_dir}/usr/share/edk2-shell/x64/Shell_Full.efi" \
         "${profile}/efiboot/" \
-        "${airootfs_dir}/boot/vmlinuz-"* \
-        "${airootfs_dir}/boot/initramfs-"*".img" \
-        "${airootfs_dir}/boot/"{intel-uc.img,intel-ucode.img,amd-uc.img,amd-ucode.img,early_ucode.cpio,microcode.cpio} \
+        "${pacstrap_dir}/boot/vmlinuz-"* \
+        "${pacstrap_dir}/boot/initramfs-"*".img" \
+        "${pacstrap_dir}/boot/"{intel-uc.img,intel-ucode.img,amd-uc.img,amd-ucode.img,early_ucode.cpio,microcode.cpio} \
         2>/dev/null | awk 'function ceil(x){return int(x)+(x>int(x))}
             function byte_to_kib(x){return x/1024}
             function mib_to_kib(x){return x*1024}
@@ -517,7 +525,7 @@ _make_bootmode_uefi-x64.systemd-boot.esp() {
 
     mmd -i "${work_dir}/efiboot.img" ::/EFI ::/EFI/BOOT
     mcopy -i "${work_dir}/efiboot.img" \
-        "${airootfs_dir}/usr/lib/systemd/boot/efi/systemd-bootx64.efi" ::/EFI/BOOT/BOOTx64.EFI
+        "${pacstrap_dir}/usr/lib/systemd/boot/efi/systemd-bootx64.efi" ::/EFI/BOOT/BOOTx64.EFI
 
     mmd -i "${work_dir}/efiboot.img" ::/loader ::/loader/entries
     mcopy -i "${work_dir}/efiboot.img" "${profile}/efiboot/loader/loader.conf" ::/loader/
@@ -529,9 +537,9 @@ _make_bootmode_uefi-x64.systemd-boot.esp() {
     done
 
     # shellx64.efi is picked up automatically when on /
-    if [[ -e "${airootfs_dir}/usr/share/edk2-shell/x64/Shell_Full.efi" ]]; then
+    if [[ -e "${pacstrap_dir}/usr/share/edk2-shell/x64/Shell_Full.efi" ]]; then
         mcopy -i "${work_dir}/efiboot.img" \
-            "${airootfs_dir}/usr/share/edk2-shell/x64/Shell_Full.efi" ::/shellx64.efi
+            "${pacstrap_dir}/usr/share/edk2-shell/x64/Shell_Full.efi" ::/shellx64.efi
     fi
 
     # Copy kernel and initramfs
@@ -664,6 +672,37 @@ _validate_requirements_airootfs_image_type_erofs() {
     fi
 }
 
+_validate_requirements_buildmode_all() {
+    if ! command -v pacman &> /dev/null; then
+        (( validation_error=validation_error+1 ))
+        _msg_error "Validating build mode '${_buildmode}': pacman is not available on this host. Install 'pacman'!" 0
+    fi
+    if ! command -v find &> /dev/null; then
+        (( validation_error=validation_error+1 ))
+        _msg_error "Validating build mode '${_buildmode}': find is not available on this host. Install 'findutils'!" 0
+    fi
+    if ! command -v gzip &> /dev/null; then
+        (( validation_error=validation_error+1 ))
+        _msg_error "Validating build mode '${_buildmode}': gzip is not available on this host. Install 'gzip'!" 0
+    fi
+}
+
+_validate_requirements_buildmode_bootstrap() {
+    _validate_requirements_buildmode_all
+    if ! command -v bsdtar &> /dev/null; then
+        (( validation_error=validation_error+1 ))
+        _msg_error "Validating build mode '${_buildmode}': bsdtar is not available on this host. Install 'libarchive'!" 0
+    fi
+}
+
+_validate_requirements_buildmode_iso() {
+    _validate_requirements_buildmode_all
+    if ! command -v awk &> /dev/null; then
+        (( validation_error=validation_error+1 ))
+        _msg_error "Validating build mode '${_buildmode}': awk is not available on this host. Install 'awk'!" 0
+    fi
+}
+
 # SYSLINUX El Torito
 _add_xorrisofs_options_bios.syslinux.eltorito() {
     xorrisofs_options+=(
@@ -763,8 +802,24 @@ _add_xorrisofs_options_uefi-x64.systemd-boot.eltorito() {
     [[ " ${bootmodes[*]} " =~ ' bios.' ]] || xorrisofs_options+=('-eltorito-catalog' 'EFI/boot.cat')
 }
 
+# Build bootstrap image
+_build_bootstrap_image() {
+    local _bootstrap_parent
+    _bootstrap_parent="$(dirname -- "${pacstrap_dir}")"
+
+    [[ -d "${out_dir}" ]] || install -d -- "${out_dir}"
+
+    cd -- "${_bootstrap_parent}"
+
+    _msg_info "Creating bootstrap image..."
+    bsdtar -cf - "root.${arch}" | gzip -cn9 > "${out_dir}/${image_name}"
+    _msg_info "Done!"
+    du -h -- "${out_dir}/${image_name}"
+    cd -- "${OLDPWD}"
+}
+
 # Build ISO
-_build_iso() {
+_build_iso_image() {
     local xorrisofs_options=()
     local bootmode
 
@@ -789,10 +844,10 @@ _build_iso() {
             -publisher "${iso_publisher}" \
             -preparer "prepared by ${app_name}" \
             "${xorrisofs_options[@]}" \
-            -output "${out_dir}/${img_name}" \
+            -output "${out_dir}/${image_name}" \
             "${isofs_dir}/"
     _msg_info "Done!"
-    du -h -- "${out_dir}/${img_name}"
+    du -h -- "${out_dir}/${image_name}"
 }
 
 # Read profile's values from profiledef.sh
@@ -816,14 +871,23 @@ _read_profile() {
         packages="$(realpath -- "${packages}")"
         pacman_conf="$(realpath -- "${pacman_conf}")"
 
+        # Resolve paths of files that may reside in the profile's directory
+        if [[ -z "$bootstrap_packages" ]] && [[ -e "${profile}/bootstrap_packages.${arch}" ]]; then
+            bootstrap_packages="${profile}/bootstrap_packages.${arch}"
+            bootstrap_packages="$(realpath -- "${bootstrap_packages}")"
+            pacman_conf="$(realpath -- "${pacman_conf}")"
+        fi
+
         cd -- "${OLDPWD}"
     fi
 }
 
 # Validate set options
 _validate_options() {
-    local validation_error=0 bootmode
+    local validation_error=0 bootmode _buildmode
     local pkg_list_from_file=()
+    local bootstrap_pkg_list_from_file=()
+
     _msg_info "Validating options..."
     # Check if the package list file exists and read packages from it
     if [[ -e "${packages}" ]]; then
@@ -835,8 +899,23 @@ _validate_options() {
         fi
     else
         (( validation_error=validation_error+1 ))
-        _msg_error "File '${packages}' does not exist." 0
+        _msg_error "Packages file '${packages}' does not exist." 0
+    fi
 
+    # Check if packages for the bootstrap image are specified
+    if [[ "${buildmodes[*]}" == *bootstrap* ]]; then
+        if [[ -e "${bootstrap_packages}" ]]; then
+            mapfile -t bootstrap_pkg_list_from_file < \
+                <(sed '/^[[:blank:]]*#.*/d;s/#.*//;/^[[:blank:]]*$/d' "${bootstrap_packages}")
+            bootstrap_pkg_list+=("${bootstrap_pkg_list_from_file[@]}")
+            if (( ${#bootstrap_pkg_list_from_file} < 1 )); then
+                (( validation_error=validation_error+1 ))
+                _msg_error "No package specified in '${bootstrap_packages}'." 0
+            fi
+        else
+            (( validation_error=validation_error+1 ))
+            _msg_error "Bootstrap packages file '${bootstrap_packages}' does not exist." 0
+        fi
     fi
 
     # Check if pacman configuration file exists
@@ -844,6 +923,21 @@ _validate_options() {
         (( validation_error=validation_error+1 ))
         _msg_error "File '${pacman_conf}' does not exist." 0
     fi
+
+    # Check if the specified buildmodes are supported
+    for _buildmode in "${buildmodes[@]}"; do
+        if typeset -f "_build_buildmode_${_buildmode}" &> /dev/null; then
+            if typeset -f "_validate_requirements_buildmode_${_buildmode}" &> /dev/null; then
+                "_validate_requirements_buildmode_${_buildmode}"
+            else
+                _msg_warning "Function '_validate_requirements_buildmode_${_buildmode}' does not exist. Validating the requirements of '${_buildmode}' build mode will not be possible."
+            fi
+        else
+            (( validation_error=validation_error+1 ))
+            _msg_error "${_buildmode} is not a valid build mode!" 0
+        fi
+    done
+
     # Check if the specified bootmodes are supported
     for bootmode in "${bootmodes[@]}"; do
         if typeset -f "_make_bootmode_${bootmode}" &> /dev/null; then
@@ -868,6 +962,7 @@ _validate_options() {
         (( validation_error=validation_error+1 ))
         _msg_error "Unsupported image type: '${airootfs_image_type}'" 0
     fi
+
     if (( validation_error )); then
         _msg_error "${validation_error} errors were encountered while validating the profile. Aborting." 1
     fi
@@ -877,6 +972,10 @@ _validate_options() {
 # Set defaults and, if present, overrides from mkarchiso command line option parameters
 _set_overrides() {
     # Set variables that have command line overrides
+    [[ ! -v override_buildmodes ]] || buildmodes=("${override_buildmodes[@]}")
+    if (( "${#buildmodes[@]}" < 1 )); then
+        buildmodes+=('iso')
+    fi
     if [[ -v override_work_dir ]]; then
         work_dir="$override_work_dir"
     elif [[ -z "$work_dir" ]]; then
@@ -896,6 +995,7 @@ _set_overrides() {
     fi
     pacman_conf="$(realpath -- "$pacman_conf")"
     [[ ! -v override_pkg_list ]] || pkg_list+=("${override_pkg_list[@]}")
+    # TODO: allow overriding bootstrap_pkg_list
     if [[ -v override_iso_label ]]; then
         iso_label="$override_iso_label"
     elif [[ -z "$iso_label" ]]; then
@@ -927,7 +1027,6 @@ _set_overrides() {
     [[ -n "$arch" ]] || arch="$(uname -m)"
     [[ -n "$airootfs_image_type" ]] || airootfs_image_type="squashfs"
     [[ -n "$iso_name" ]] || iso_name="${app_name}"
-    [[ -n "$img_name" ]] || img_name="${iso_name}-${iso_version}-${arch}.iso"
 }
 
 _export_gpg_publickey() {
@@ -935,43 +1034,84 @@ _export_gpg_publickey() {
 }
 
 _make_version() {
-    local osrelease
-    install -d -m 0755 -- "${isofs_dir}/${install_dir}"
-    _msg_info "Creating files with iso version..."
-    # Write version file to airootfs
-    rm -f -- "${airootfs_dir}/version"
-    printf '%s\n' "${iso_version}" > "${airootfs_dir}/version"
-    # Write version file to ISO 9660
-    printf '%s\n' "${iso_version}" > "${isofs_dir}/${install_dir}/version"
-    # Write grubenv with version information to ISO 9660
-    printf '%.1024s' "$(printf '# GRUB Environment Block\nNAME=%s\nVERSION=%s\n%s' \
-        "${iso_name}" "${iso_version}" "$(printf '%0.1s' "#"{1..1024})")" \
-        > "${isofs_dir}/${install_dir}/grubenv"
+    local _os_release
+
+    _msg_info "Creating version files..."
+    # Write version file to system installation dir
+    rm -f -- "${pacstrap_dir}/version"
+    printf '%s\n' "${iso_version}" > "${pacstrap_dir}/version"
+
+    if [[ "${buildmode}" == "iso" ]]; then
+        install -d -m 0755 -- "${isofs_dir}/${install_dir}"
+        # Write version file to ISO 9660
+        printf '%s\n' "${iso_version}" > "${isofs_dir}/${install_dir}/version"
+        # Write grubenv with version information to ISO 9660
+        printf '%.1024s' "$(printf '# GRUB Environment Block\nNAME=%s\nVERSION=%s\n%s' \
+            "${iso_name}" "${iso_version}" "$(printf '%0.1s' "#"{1..1024})")" \
+            > "${isofs_dir}/${install_dir}/grubenv"
+    fi
+
     # Append IMAGE_ID & IMAGE_VERSION to os-release
-    osrelease="$(realpath -- "${airootfs_dir}/etc/os-release")"
-    if [[ ! -e "${airootfs_dir}/etc/os-release" && -e "${airootfs_dir}/usr/lib/os-release" ]]; then
-        osrelease="$(realpath -- "${airootfs_dir}/usr/lib/os-release")"
+    _os_release="$(realpath -- "${pacstrap_dir}/etc/os-release")"
+    if [[ ! -e "${pacstrap_dir}/etc/os-release" && -e "${pacstrap_dir}/usr/lib/os-release" ]]; then
+        _os_release="$(realpath -- "${pacstrap_dir}/usr/lib/os-release")"
     fi
-    if [[ "${osrelease}" != "${airootfs_dir}"* ]]; then
-        _msg_warning "os-release file '${osrelease}' is outside of valid path."
+    if [[ "${_os_release}" != "${pacstrap_dir}"* ]]; then
+        _msg_warning "os-release file '${_os_release}' is outside of valid path."
     else
-        [[ ! -e "${osrelease}" ]] || sed -i '/^IMAGE_ID=/d;/^IMAGE_VERSION=/d' "${osrelease}"
-        printf 'IMAGE_ID=%s\nIMAGE_VERSION=%s\n' "${iso_name}" "${iso_version}" >> "${osrelease}"
+        [[ ! -e "${_os_release}" ]] || sed -i '/^IMAGE_ID=/d;/^IMAGE_VERSION=/d' "${_os_release}"
+        printf 'IMAGE_ID=%s\nIMAGE_VERSION=%s\n' "${iso_name}" "${iso_version}" >> "${_os_release}"
     fi
     _msg_info "Done!"
 }
 
 _make_pkglist() {
-    install -d -m 0755 -- "${isofs_dir}/${install_dir}"
     _msg_info "Creating a list of installed packages on live-enviroment..."
-    pacman -Q --sysroot "${airootfs_dir}" > "${isofs_dir}/${install_dir}/pkglist.${arch}.txt"
+    case "${buildmode}" in
+        "bootstrap")
+            pacman -Q --sysroot "${pacstrap_dir}" > "${pacstrap_dir}/pkglist.${arch}.txt"
+            ;;
+        "iso")
+            install -d -m 0755 -- "${isofs_dir}/${install_dir}"
+            pacman -Q --sysroot "${pacstrap_dir}" > "${isofs_dir}/${install_dir}/pkglist.${arch}.txt"
+            ;;
+    esac
     _msg_info "Done!"
 }
 
-_build_profile() {
+_build_buildmode_bootstrap() {
+    local image_name="${iso_name}-bootstrap-${iso_version}-${arch}.tar.gz"
+    local run_once_mode="${buildmode}"
+    local buildmode_packages="${bootstrap_packages}"
+    local buildmode_pkg_list=()
+
+    # Set the package list to use
+    buildmode_pkg_list=("${bootstrap_pkg_list[@]}")
+    # Set up essential directory paths
+    pacstrap_dir="${work_dir}/${arch}/bootstrap/root.${arch}"
+    [[ -d "${work_dir}" ]] || install -d -- "${work_dir}"
+    install -d -m 0755 -o 0 -g 0 -- "${pacstrap_dir}"
+
+    [[ "${quiet}" == "y" ]] || _show_config
+    _run_once _make_pacman_conf
+    _run_once _make_packages
+    _run_once _make_version
+    _run_once _make_pkglist
+    _run_once _cleanup_pacstrap_dir
+    _run_once _build_bootstrap_image
+}
+
+_build_buildmode_iso() {
+    local image_name="${iso_name}-${iso_version}-${arch}.iso"
+    local run_once_mode="${buildmode}"
+    local buildmode_packages="${packages}"
+    local buildmode_pkg_list=()
     # Set up essential directory paths
-    airootfs_dir="${work_dir}/${arch}/airootfs"
+    pacstrap_dir="${work_dir}/${arch}/airootfs"
     isofs_dir="${work_dir}/iso"
+    # Set the package list to use
+    buildmode_pkg_list=("${pkg_list[@]}")
+
     # Create working directory
     [[ -d "${work_dir}" ]] || install -d -- "${work_dir}"
     # Write build date to file or if the file exists, read it from there
@@ -990,12 +1130,22 @@ _build_profile() {
     _run_once _make_customize_airootfs
     _run_once _make_pkglist
     _make_bootmodes
-    _run_once _cleanup_airootfs
+    _run_once _cleanup_pacstrap_dir
     _run_once _prepare_airootfs_image
-    _run_once _build_iso
+    _run_once _build_iso_image
+}
+
+# build all buildmodes
+_build() {
+    local buildmode
+    local run_once_mode="build"
+
+    for buildmode in "${buildmodes[@]}"; do
+        _run_once "_build_buildmode_${buildmode}"
+    done
 }
 
-while getopts 'p:C:L:P:A:D:w:o:g:vh?' arg; do
+while getopts 'p:C:L:P:A:D:w:m:o:g:vh?' arg; do
     case "${arg}" in
         p) read -r -a override_pkg_list <<< "${OPTARG}" ;;
         C) override_pacman_conf="${OPTARG}" ;;
@@ -1004,6 +1154,7 @@ while getopts 'p:C:L:P:A:D:w:o:g:vh?' arg; do
         A) override_iso_application="${OPTARG}" ;;
         D) override_install_dir="${OPTARG}" ;;
         w) override_work_dir="${OPTARG}" ;;
+        m) read -r -a override_buildmodes <<< "${OPTARG}" ;;
         o) override_out_dir="${OPTARG}" ;;
         g) override_gpg_key="${OPTARG}" ;;
         v) override_quiet="n" ;;
@@ -1032,6 +1183,6 @@ profile="$(realpath -- "${1}")"
 _read_profile
 _set_overrides
 _validate_options
-_build_profile
+_build
 
 # vim:ts=4:sw=4:et:
-- 
cgit v1.2.3-70-g09d2


From d54bf635cd928e2d2e224995806fcc3c5ea5dbce Mon Sep 17 00:00:00 2001
From: David Runge <dvzrv@archlinux.org>
Date: Thu, 6 May 2021 00:56:02 +0200
Subject: mkarchiso: Add buildmode to export netboot artifacts

archiso/mkarchiso:
Implement a buildmode to export artifacts required for netboot with IPXE.
When providing the buildmode 'netboot' via profiledef.sh or the `-m` option, all targets necessary to create an ISO
medium are built, but the components required for netboot are exported to the output dir.
Optionally, it is possible to provide a set of certificates for codsigning using the `-c` option, where the first file
is considered as the signer certificate and the second as the key.

Add `_export_netboot_artifacts()` to copy build artifacts to the output directory.
Add `_sign_netboot_artifacts()` to codesign the netboot artifacts in the work directory.
Add `_validate_requirements_buildmode_netboot()` to check for openssl.
Add `_build_iso_base()` to implement common function calls between the 'iso' and the 'netboot' buildmodes.
Add `_build_buildmode_netboot()` to make use of `_build_iso_base()`, (optionally) `_sign_netboot_artifacts()` and
`_export_netboot_artifacts()`.
Change `_build_buildmode_iso()` to make use of `_build_iso_base()`.
Add `-c` as an option to mkarchiso to read in a list of file names.
Unify the output of `_usage()` by using the same definition style for lists of strings provided to options that accept
them (e.g. `-c`, `-m`, `-p`).

Closes #128
---
 archiso/mkarchiso | 148 ++++++++++++++++++++++++++++++++++++++++++------------
 1 file changed, 115 insertions(+), 33 deletions(-)

(limited to 'archiso/mkarchiso')

diff --git a/archiso/mkarchiso b/archiso/mkarchiso
index 683f90e..ff6aec5 100755
--- a/archiso/mkarchiso
+++ b/archiso/mkarchiso
@@ -34,6 +34,8 @@ buildmodes=()
 bootmodes=()
 airootfs_image_type=""
 airootfs_image_tool_options=()
+cert_list=()
+sign_netboot_artifacts=""
 declare -A file_permissions=()
 
 
@@ -96,13 +98,17 @@ usage: ${app_name} [options] <profile_dir>
                       Default: '${iso_label}'
      -P <publisher>   Set the ISO publisher
                       Default: '${iso_publisher}'
+     -c [cert ..]     Provide certificates for codesigning of netboot artifacts
+                      Multiple files are provided as quoted, space delimited list.
+                      The first file is considered as the signing certificate,
+                      the second as the key.
      -g <gpg_key>     Set the PGP key ID to be used for signing the rootfs image
      -h               This message
-     -m [build modes] Build modes to use (valid modes are: 'bootstrap' and 'iso').
+     -m [mode ..]     Build mode(s) to use (valid modes are: 'bootstrap', 'iso' and 'netboot').
                       Multiple build modes are provided as quoted, space delimited list.
      -o <out_dir>     Set the output directory
                       Default: '${out_dir}'
-     -p PACKAGE(S)    Package(s) to install.
+     -p [package ..]  Package(s) to install.
                       Multiple packages are provided as quoted, space delimited list.
      -v               Enable verbose output
      -w <work_dir>    Set the working directory
@@ -127,6 +133,7 @@ _show_config() {
     _msg_info "       Current build mode:   ${buildmode}"
     _msg_info "              Build modes:   ${buildmodes[*]}"
     _msg_info "                  GPG key:   ${gpg_key:-None}"
+    _msg_info "Code signing certificates:   ${cert_list[*]}"
     _msg_info "                  Profile:   ${profile}"
     _msg_info "Pacman configuration file:   ${pacman_conf}"
     _msg_info "          Image file name:   ${image_name:-None}"
@@ -650,6 +657,34 @@ _prepare_airootfs_image() {
     fi
 }
 
+# export build artifacts for netboot
+_export_netboot_artifacts() {
+    _msg_info "Exporting netboot artifacts..."
+    install -d -m 0755 "${out_dir}"
+    cp -a -- "${isofs_dir}/${install_dir}/" "${out_dir}/"
+    _msg_info "Done!"
+    du -h -- "${out_dir}/${install_dir}"
+}
+
+# sign build artifacts for netboot
+_sign_netboot_artifacts() {
+    local _file _dir
+    _msg_info "Signing netboot artifacts..."
+    _dir="${isofs_dir}/${install_dir}/"
+    for _file in "${_dir}/boot/"*ucode.img "${_dir}/boot/${arch}/vmlinuz-"* "${_dir}/boot/${arch}/initramfs-"*.img; do
+        openssl cms \
+            -sign \
+            -binary \
+            -noattr \
+            -in "${_file}" \
+            -signer "${cert_list[0]}" \
+            -inkey "${cert_list[1]}" \
+            -outform DER \
+            -out "${_file}".ipxe.sig
+    done
+    _msg_info "Done!"
+}
+
 _validate_requirements_airootfs_image_type_squashfs() {
     if ! command -v mksquashfs &> /dev/null; then
         (( validation_error=validation_error+1 ))
@@ -703,6 +738,14 @@ _validate_requirements_buildmode_iso() {
     fi
 }
 
+_validate_requirements_buildmode_netboot() {
+    _validate_requirements_buildmode_all
+    if ! command -v openssl &> /dev/null; then
+        (( validation_error=validation_error+1 ))
+        _msg_error "Validating build mode '${_buildmode}': openssl is not available on this host. Install 'openssl'!" 0
+    fi
+}
+
 # SYSLINUX El Torito
 _add_xorrisofs_options_bios.syslinux.eltorito() {
     xorrisofs_options+=(
@@ -884,9 +927,10 @@ _read_profile() {
 
 # Validate set options
 _validate_options() {
-    local validation_error=0 bootmode _buildmode
+    local validation_error=0 bootmode _cert _buildmode
     local pkg_list_from_file=()
     local bootstrap_pkg_list_from_file=()
+    local _override_cert_list=()
 
     _msg_info "Validating options..."
     # Check if the package list file exists and read packages from it
@@ -917,7 +961,23 @@ _validate_options() {
             _msg_error "Bootstrap packages file '${bootstrap_packages}' does not exist." 0
         fi
     fi
-
+    if [[ "${sign_netboot_artifacts}" == "y" ]]; then
+        # Check if the certificate files exist
+        for _cert in "${cert_list[@]}"; do
+            if [[ -e "${_cert}" ]]; then
+                _override_cert_list+=("$(realpath -- "${_cert}")")
+            else
+                (( validation_error=validation_error+1 ))
+                _msg_error "File '${_cert}' does not exist." 0
+            fi
+        done
+        cert_list=("${_override_cert_list[@]}")
+        # Check if there are at least two certificate files
+        if (( "${#cert_list[@]}" < 2 )); then
+            (( validation_error=validation_error+1 ))
+            _msg_error "Two certificates are required for codesigning, but '${cert_list[*]}' is provided." 0
+        fi
+    fi
     # Check if pacman configuration file exists
     if [[ ! -e "${pacman_conf}" ]]; then
         (( validation_error=validation_error+1 ))
@@ -1017,6 +1077,10 @@ _set_overrides() {
         install_dir="${app_name}"
     fi
     [[ ! -v override_gpg_key ]] || gpg_key="$override_gpg_key"
+    if [[ -v override_cert_list ]]; then
+        sign_netboot_artifacts="y"
+    fi
+    [[ ! -v override_cert_list ]] || cert_list+=("${override_cert_list[@]}")
     if [[ -v override_quiet ]]; then
         quiet="$override_quiet"
     elif [[ -z "$quiet" ]]; then
@@ -1079,38 +1143,15 @@ _make_pkglist() {
     _msg_info "Done!"
 }
 
-_build_buildmode_bootstrap() {
-    local image_name="${iso_name}-bootstrap-${iso_version}-${arch}.tar.gz"
-    local run_once_mode="${buildmode}"
-    local buildmode_packages="${bootstrap_packages}"
-    local buildmode_pkg_list=()
-
-    # Set the package list to use
-    buildmode_pkg_list=("${bootstrap_pkg_list[@]}")
-    # Set up essential directory paths
-    pacstrap_dir="${work_dir}/${arch}/bootstrap/root.${arch}"
-    [[ -d "${work_dir}" ]] || install -d -- "${work_dir}"
-    install -d -m 0755 -o 0 -g 0 -- "${pacstrap_dir}"
-
-    [[ "${quiet}" == "y" ]] || _show_config
-    _run_once _make_pacman_conf
-    _run_once _make_packages
-    _run_once _make_version
-    _run_once _make_pkglist
-    _run_once _cleanup_pacstrap_dir
-    _run_once _build_bootstrap_image
-}
-
-_build_buildmode_iso() {
-    local image_name="${iso_name}-${iso_version}-${arch}.iso"
-    local run_once_mode="${buildmode}"
+# build the base for an ISO and/or a netboot target
+_build_iso_base() {
+    local run_once_mode="base"
     local buildmode_packages="${packages}"
-    local buildmode_pkg_list=()
+    # Set the package list to use
+    local buildmode_pkg_list=("${pkg_list[@]}")
     # Set up essential directory paths
     pacstrap_dir="${work_dir}/${arch}/airootfs"
     isofs_dir="${work_dir}/iso"
-    # Set the package list to use
-    buildmode_pkg_list=("${pkg_list[@]}")
 
     # Create working directory
     [[ -d "${work_dir}" ]] || install -d -- "${work_dir}"
@@ -1132,6 +1173,46 @@ _build_buildmode_iso() {
     _make_bootmodes
     _run_once _cleanup_pacstrap_dir
     _run_once _prepare_airootfs_image
+}
+
+# Build the bootstrap buildmode
+_build_buildmode_bootstrap() {
+    local image_name="${iso_name}-bootstrap-${iso_version}-${arch}.tar.gz"
+    local run_once_mode="${buildmode}"
+    local buildmode_packages="${bootstrap_packages}"
+    # Set the package list to use
+    local buildmode_pkg_list=("${bootstrap_pkg_list[@]}")
+
+    # Set up essential directory paths
+    pacstrap_dir="${work_dir}/${arch}/bootstrap/root.${arch}"
+    [[ -d "${work_dir}" ]] || install -d -- "${work_dir}"
+    install -d -m 0755 -o 0 -g 0 -- "${pacstrap_dir}"
+
+    [[ "${quiet}" == "y" ]] || _show_config
+    _run_once _make_pacman_conf
+    _run_once _make_packages
+    _run_once _make_version
+    _run_once _make_pkglist
+    _run_once _cleanup_pacstrap_dir
+    _run_once _build_bootstrap_image
+}
+
+# Build the netboot buildmode
+_build_buildmode_netboot() {
+    local run_once_mode="${buildmode}"
+
+    _run_once _build_iso_base
+    if [[ -v cert_list ]]; then
+        _run_once _sign_netboot_artifacts
+    fi
+    _run_once _export_netboot_artifacts
+}
+
+# Build the ISO buildmode
+_build_buildmode_iso() {
+    local image_name="${iso_name}-${iso_version}-${arch}.iso"
+    local run_once_mode="${buildmode}"
+    _run_once _build_iso_base
     _run_once _build_iso_image
 }
 
@@ -1145,7 +1226,7 @@ _build() {
     done
 }
 
-while getopts 'p:C:L:P:A:D:w:m:o:g:vh?' arg; do
+while getopts 'c:p:C:L:P:A:D:w:m:o:g:vh?' arg; do
     case "${arg}" in
         p) read -r -a override_pkg_list <<< "${OPTARG}" ;;
         C) override_pacman_conf="${OPTARG}" ;;
@@ -1153,6 +1234,7 @@ while getopts 'p:C:L:P:A:D:w:m:o:g:vh?' arg; do
         P) override_iso_publisher="${OPTARG}" ;;
         A) override_iso_application="${OPTARG}" ;;
         D) override_install_dir="${OPTARG}" ;;
+        c) read -r -a override_cert_list <<< "${OPTARG}" ;;
         w) override_work_dir="${OPTARG}" ;;
         m) read -r -a override_buildmodes <<< "${OPTARG}" ;;
         o) override_out_dir="${OPTARG}" ;;
-- 
cgit v1.2.3-70-g09d2


From 6b11d7be7a4422ca00a023c521f6344652f5b2d1 Mon Sep 17 00:00:00 2001
From: David Runge <dvzrv@archlinux.org>
Date: Mon, 10 May 2021 22:42:27 +0200
Subject: mkarchiso: Also create package list for netboot

archiso/mkarchiso:
Change `_make_pkglist()` to also generate the package list when using the netboot build mode.
---
 archiso/mkarchiso | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'archiso/mkarchiso')

diff --git a/archiso/mkarchiso b/archiso/mkarchiso
index ff6aec5..bcc095f 100755
--- a/archiso/mkarchiso
+++ b/archiso/mkarchiso
@@ -1135,7 +1135,7 @@ _make_pkglist() {
         "bootstrap")
             pacman -Q --sysroot "${pacstrap_dir}" > "${pacstrap_dir}/pkglist.${arch}.txt"
             ;;
-        "iso")
+        "iso"|"netboot")
             install -d -m 0755 -- "${isofs_dir}/${install_dir}"
             pacman -Q --sysroot "${pacstrap_dir}" > "${isofs_dir}/${install_dir}/pkglist.${arch}.txt"
             ;;
-- 
cgit v1.2.3-70-g09d2


From 3d6651abf74ee4eb91212bd9a7d3478c95126cfb Mon Sep 17 00:00:00 2001
From: nl6720 <nl6720@gmail.com>
Date: Tue, 1 Jun 2021 16:48:54 +0300
Subject: archiso/mkarchiso: clear environment variables when chrooting

Environment variables can interfere with the commands in chroot.
This causes issues when the environment variables specify a path that does not exist inside the chroot, e.g. if TMPDIR is set to a custom value.

Fixes https://bugs.archlinux.org/task/70580 .
---
 archiso/mkarchiso | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

(limited to 'archiso/mkarchiso')

diff --git a/archiso/mkarchiso b/archiso/mkarchiso
index bcc095f..10daa6e 100755
--- a/archiso/mkarchiso
+++ b/archiso/mkarchiso
@@ -324,13 +324,12 @@ _make_packages() {
 
     if [[ -n "${gpg_key}" ]]; then
         exec {ARCHISO_GNUPG_FD}<>"${work_dir}/pubkey.gpg"
-        export ARCHISO_GNUPG_FD
     fi
 
     if [[ "${quiet}" = "y" ]]; then
-        pacstrap -C "${work_dir}/${buildmode}.pacman.conf" -c -G -M -- "${pacstrap_dir}" "${buildmode_pkg_list[@]}" &> /dev/null
+        env -i "ARCHISO_GNUPG_FD=${ARCHISO_GNUPG_FD}" 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 -i "ARCHISO_GNUPG_FD=${ARCHISO_GNUPG_FD}" pacstrap -C "${work_dir}/${buildmode}.pacman.conf" -c -G -M -- "${pacstrap_dir}" "${buildmode_pkg_list[@]}"
     fi
 
     if [[ -n "${gpg_key}" ]]; then
@@ -372,7 +371,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 -- arch-chroot "${pacstrap_dir}" "/root/customize_airootfs.sh"
+        eval -- env -i arch-chroot "${pacstrap_dir}" "/root/customize_airootfs.sh"
         rm -- "${pacstrap_dir}/root/customize_airootfs.sh"
         _msg_info "Done! customize_airootfs.sh run successfully."
     fi
-- 
cgit v1.2.3-70-g09d2


From 62e74c7e7954756b8653f0edb679eb970a4b49a4 Mon Sep 17 00:00:00 2001
From: nl6720 <nl6720@gmail.com>
Date: Sat, 5 Jun 2021 08:23:14 +0300
Subject: mkarchiso: fix unbound variable when not using GPG signing

Fixes #138
---
 archiso/mkarchiso | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

(limited to 'archiso/mkarchiso')

diff --git a/archiso/mkarchiso b/archiso/mkarchiso
index 10daa6e..685ad43 100755
--- a/archiso/mkarchiso
+++ b/archiso/mkarchiso
@@ -320,16 +320,18 @@ _make_custom_airootfs() {
 
 # Install desired packages to airootfs
 _make_packages() {
+    local envvars_in_chroot=()
     _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}")
     fi
 
     if [[ "${quiet}" = "y" ]]; then
-        env -i "ARCHISO_GNUPG_FD=${ARCHISO_GNUPG_FD}" pacstrap -C "${work_dir}/${buildmode}.pacman.conf" -c -G -M -- "${pacstrap_dir}" "${buildmode_pkg_list[@]}" &> /dev/null
+        env -i "${envvars_in_chroot[@]}" pacstrap -C "${work_dir}/${buildmode}.pacman.conf" -c -G -M -- "${pacstrap_dir}" "${buildmode_pkg_list[@]}" &> /dev/null
     else
-        env -i "ARCHISO_GNUPG_FD=${ARCHISO_GNUPG_FD}" pacstrap -C "${work_dir}/${buildmode}.pacman.conf" -c -G -M -- "${pacstrap_dir}" "${buildmode_pkg_list[@]}"
+        env -i "${envvars_in_chroot[@]}" pacstrap -C "${work_dir}/${buildmode}.pacman.conf" -c -G -M -- "${pacstrap_dir}" "${buildmode_pkg_list[@]}"
     fi
 
     if [[ -n "${gpg_key}" ]]; then
-- 
cgit v1.2.3-70-g09d2


From 6e1ca35e599d40f435ec705c6f0263b20e5f5c32 Mon Sep 17 00:00:00 2001
From: nl6720 <nl6720@gmail.com>
Date: Sun, 13 Jun 2021 13:14:13 +0300
Subject: Update ArchWiki article URLs

Use the new, prettier short URLs.
---
 README.rst                                               | 2 +-
 archiso/mkarchiso                                        | 4 ++--
 configs/releng/airootfs/etc/motd                         | 2 +-
 configs/releng/airootfs/usr/local/bin/Installation_guide | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

(limited to 'archiso/mkarchiso')

diff --git a/README.rst b/README.rst
index 6de4f37..79f2846 100644
--- a/README.rst
+++ b/README.rst
@@ -143,7 +143,7 @@ Contribute
 
 Development of archiso takes place on Arch Linux' Gitlab: https://gitlab.archlinux.org/archlinux/archiso.
 
-Please read our distribution-wide `Code of Conduct <https://wiki.archlinux.org/index.php/Code_of_conduct>`_ before
+Please read our distribution-wide `Code of Conduct <https://wiki.archlinux.org/title/Code_of_conduct>`_ before
 contributing, to understand what actions will and will not be tolerated.
 
 Read our `contributing guide <CONTRIBUTING.rst>`_ to learn more about how to provide fixes or improvements for the code
diff --git a/archiso/mkarchiso b/archiso/mkarchiso
index 685ad43..29e7dc4 100755
--- a/archiso/mkarchiso
+++ b/archiso/mkarchiso
@@ -439,7 +439,7 @@ _make_bootmode_bios.syslinux.mbr() {
 
     # Add other aditional/extra files to ${install_dir}/boot/
     if [[ -e "${pacstrap_dir}/boot/memtest86+/memtest.bin" ]]; then
-        # rename for PXE: https://wiki.archlinux.org/index.php/Syslinux#Using_memtest
+        # rename for PXE: https://wiki.archlinux.org/title/Syslinux#Using_memtest
         install -m 0644 -- "${pacstrap_dir}/boot/memtest86+/memtest.bin" "${isofs_dir}/${install_dir}/boot/memtest"
         install -d -m 0755 -- "${isofs_dir}/${install_dir}/boot/licenses/memtest86+/"
         install -m 0644 -- "${pacstrap_dir}/usr/share/licenses/common/GPL2/license.txt" \
@@ -767,7 +767,7 @@ _add_xorrisofs_options_bios.syslinux.mbr() {
         # When GPT is used, create an additional partition in the MBR (besides 0xEE) for sectors 0–1 (MBR
         # bootstrap code area) and mark it as bootable
         # May allow booting on some systems
-        # https://wiki.archlinux.org/index.php/Partitioning#Tricking_old_BIOS_into_booting_from_GPT
+        # https://wiki.archlinux.org/title/Partitioning#Tricking_old_BIOS_into_booting_from_GPT
         '--mbr-force-bootable'
         # Move the first partition away from the start of the ISO to match the expectations of partition editors
         # May allow booting on some systems
diff --git a/configs/releng/airootfs/etc/motd b/configs/releng/airootfs/etc/motd
index 3f82850..1ddc9c3 100644
--- a/configs/releng/airootfs/etc/motd
+++ b/configs/releng/airootfs/etc/motd
@@ -1,5 +1,5 @@
 To install Arch Linux follow the installation guide:
-https://wiki.archlinux.org/index.php/Installation_guide
+https://wiki.archlinux.org/title/Installation_guide
 
 For Wi-Fi, authenticate to the wireless network using the iwctl utility.
 For mobile broadband (WWAN) modems, connect with the mmcli utility.
diff --git a/configs/releng/airootfs/usr/local/bin/Installation_guide b/configs/releng/airootfs/usr/local/bin/Installation_guide
index d790c3e..4266754 100755
--- a/configs/releng/airootfs/usr/local/bin/Installation_guide
+++ b/configs/releng/airootfs/usr/local/bin/Installation_guide
@@ -2,4 +2,4 @@
 #
 # SPDX-License-Identifier: GPL-3.0-or-later
 
-exec lynx 'https://wiki.archlinux.org/index.php/Installation_guide'
+exec lynx 'https://wiki.archlinux.org/title/Installation_guide'
-- 
cgit v1.2.3-70-g09d2


From cbac95ec9d8f5ab2245f23b705d5969e79d49b26 Mon Sep 17 00:00:00 2001
From: nl6720 <nl6720@gmail.com>
Date: Tue, 22 Jun 2021 09:12:22 +0300
Subject: mkarchiso: pass SOURCE_DATE_EPOCH to chroot

---
 archiso/mkarchiso | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'archiso/mkarchiso')

diff --git a/archiso/mkarchiso b/archiso/mkarchiso
index 29e7dc4..6d8c977 100755
--- a/archiso/mkarchiso
+++ b/archiso/mkarchiso
@@ -320,7 +320,7 @@ _make_custom_airootfs() {
 
 # Install desired packages to airootfs
 _make_packages() {
-    local envvars_in_chroot=()
+    local envvars_in_chroot=("SOURCE_DATE_EPOCH=${SOURCE_DATE_EPOCH}")
     _msg_info "Installing packages to '${pacstrap_dir}/'..."
 
     if [[ -n "${gpg_key}" ]]; then
@@ -373,7 +373,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 arch-chroot "${pacstrap_dir}" "/root/customize_airootfs.sh"
+        eval -- env -i "SOURCE_DATE_EPOCH=${SOURCE_DATE_EPOCH}" arch-chroot "${pacstrap_dir}" "/root/customize_airootfs.sh"
         rm -- "${pacstrap_dir}/root/customize_airootfs.sh"
         _msg_info "Done! customize_airootfs.sh run successfully."
     fi
-- 
cgit v1.2.3-70-g09d2


From 19861e4742657e50547fcfe5f07a050ad6575067 Mon Sep 17 00:00:00 2001
From: David Runge <dvzrv@archlinux.org>
Date: Tue, 29 Jun 2021 21:34:05 +0200
Subject: archiso/mkarchiso: Generalize handling of ucodes

archiso/mkarchiso:
Generalize the handling of ucode files (e.g. copying, signing, size calculation) by introducing the global readonly
array of expected ucode names instead of hardcoding them in various functions.
When making use of ucode files in `_make_boot_on_iso9660()`, `_make_bootmode_uef-x86.systemd-boot.esp()` and
`_sign_netboot_artifacts()` create a list of files that is guaranteed to contain existing files.

Fixes #132
---
 archiso/mkarchiso | 32 ++++++++++++++++++++++----------
 1 file changed, 22 insertions(+), 10 deletions(-)

(limited to 'archiso/mkarchiso')

diff --git a/archiso/mkarchiso b/archiso/mkarchiso
index 6d8c977..7cec3a9 100755
--- a/archiso/mkarchiso
+++ b/archiso/mkarchiso
@@ -37,6 +37,8 @@ airootfs_image_tool_options=()
 cert_list=()
 sign_netboot_artifacts=""
 declare -A file_permissions=()
+# adapted from GRUB_EARLY_INITRD_LINUX_STOCK in https://git.savannah.gnu.org/cgit/grub.git/tree/util/grub-mkconfig.in
+readonly ucodes=('intel-uc.img' 'intel-ucode.img' 'amd-uc.img' 'amd-ucode.img' 'early_ucode.cpio' 'microcode.cpio')
 
 
 # Show an INFO message
@@ -395,7 +397,7 @@ _make_boot_on_iso9660() {
     install -m 0644 -- "${pacstrap_dir}/boot/initramfs-"*".img" "${isofs_dir}/${install_dir}/boot/${arch}/"
     install -m 0644 -- "${pacstrap_dir}/boot/vmlinuz-"* "${isofs_dir}/${install_dir}/boot/${arch}/"
 
-    for ucode_image in {intel-uc.img,intel-ucode.img,amd-uc.img,amd-ucode.img,early_ucode.cpio,microcode.cpio}; do
+    for ucode_image in "${ucodes[@]}"; do
         if [[ -e "${pacstrap_dir}/boot/${ucode_image}" ]]; then
             install -m 0644 -- "${pacstrap_dir}/boot/${ucode_image}" "${isofs_dir}/${install_dir}/boot/"
             if [[ -e "${pacstrap_dir}/usr/share/licenses/${ucode_image%.*}/" ]]; then
@@ -494,11 +496,9 @@ _make_boot_on_fat() {
         "::/${install_dir}" "::/${install_dir}/boot" "::/${install_dir}/boot/${arch}"
     mcopy -i "${work_dir}/efiboot.img" "${pacstrap_dir}/boot/vmlinuz-"* \
         "${pacstrap_dir}/boot/initramfs-"*".img" "::/${install_dir}/boot/${arch}/"
-    for ucode_image in \
-        "${pacstrap_dir}/boot/"{intel-uc.img,intel-ucode.img,amd-uc.img,amd-ucode.img,early_ucode.cpio,microcode.cpio}
-    do
-        if [[ -e "${ucode_image}" ]]; then
-            all_ucode_images+=("${ucode_image}")
+    for ucode_image in "${ucodes[@]}"; do
+        if [[ -e "${pacstrap_dir}/boot/${ucode_image}" ]]; then
+            all_ucode_images+=("${pacstrap_dir}/boot/${ucode_image}")
         fi
     done
     if (( ${#all_ucode_images[@]} )); then
@@ -509,9 +509,15 @@ _make_boot_on_fat() {
 
 # Prepare efiboot.img::/EFI for EFI boot mode
 _make_bootmode_uefi-x64.systemd-boot.esp() {
-    local efiboot_imgsize="0"
+    local _file efiboot_imgsize="0"
+    local _available_ucodes=()
     _msg_info "Setting up systemd-boot for UEFI booting..."
 
+    for _file in "${ucodes[@]}"; do
+        if [[ -e "${pacstrap_dir}/boot/${_file}" ]]; then
+            _available_ucodes+=("${pacstrap_dir}/boot/${_file}")
+        fi
+    done
     # the required image size in KiB (rounded up to the next full MiB with an additional MiB for reserved sectors)
     efiboot_imgsize="$(du -bc \
         "${pacstrap_dir}/usr/lib/systemd/boot/efi/systemd-bootx64.efi" \
@@ -519,7 +525,7 @@ _make_bootmode_uefi-x64.systemd-boot.esp() {
         "${profile}/efiboot/" \
         "${pacstrap_dir}/boot/vmlinuz-"* \
         "${pacstrap_dir}/boot/initramfs-"*".img" \
-        "${pacstrap_dir}/boot/"{intel-uc.img,intel-ucode.img,amd-uc.img,amd-ucode.img,early_ucode.cpio,microcode.cpio} \
+        "${_available_ucodes[@]}" \
         2>/dev/null | awk 'function ceil(x){return int(x)+(x>int(x))}
             function byte_to_kib(x){return x/1024}
             function mib_to_kib(x){return x*1024}
@@ -670,9 +676,15 @@ _export_netboot_artifacts() {
 # sign build artifacts for netboot
 _sign_netboot_artifacts() {
     local _file _dir
+    local _files_to_sign=()
     _msg_info "Signing netboot artifacts..."
-    _dir="${isofs_dir}/${install_dir}/"
-    for _file in "${_dir}/boot/"*ucode.img "${_dir}/boot/${arch}/vmlinuz-"* "${_dir}/boot/${arch}/initramfs-"*.img; do
+    _dir="${isofs_dir}/${install_dir}/boot/"
+    for _file in "${ucodes[@]}"; do
+        if [[ -e "${_dir}${_file}" ]]; then
+            _files_to_sign+=("${_dir}${_file}")
+        fi
+    done
+    for _file in "${_files_to_sign[@]}" "${_dir}${arch}/vmlinuz-"* "${_dir}${arch}/initramfs-"*.img; do
         openssl cms \
             -sign \
             -binary \
-- 
cgit v1.2.3-70-g09d2


From c4d1109e49197e8ecb546ae8c47c3dda767a9e95 Mon Sep 17 00:00:00 2001
From: nl6720 <nl6720@gmail.com>
Date: Fri, 2 Jul 2021 13:50:41 +0300
Subject: 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 .
---
 archiso/mkarchiso | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

(limited to 'archiso/mkarchiso')

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
-- 
cgit v1.2.3-70-g09d2


From d65682a7651bfd7daf74efa439ee1b47c3d98ead Mon Sep 17 00:00:00 2001
From: nl6720 <nl6720@gmail.com>
Date: Fri, 2 Jul 2021 13:55:22 +0300
Subject: mkarchiso: unset TMPDIR to work around FS#70580

Alternative to 3d6651abf74ee4eb91212bd9a7d3478c95126cfb which caused issues.

Fixes https://bugs.archlinux.org/task/70580 .
---
 archiso/mkarchiso | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

(limited to 'archiso/mkarchiso')

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
-- 
cgit v1.2.3-70-g09d2


From 1e5b3a57f5b54da3b05be3c8f822d0d2cbdf9a6a Mon Sep 17 00:00:00 2001
From: nl6720 <nl6720@gmail.com>
Date: Fri, 2 Jul 2021 15:34:32 +0300
Subject: mkarchiso: set LC_ALL instead of LANG

LC_ALL overrides LANG and all LC_* variables, so use it instead.
See https://www.gnu.org/software/gettext/manual/html_node/Locale-Environment-Variables.html#Locale-Environment-Variables .
---
 archiso/mkarchiso | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'archiso/mkarchiso')

diff --git a/archiso/mkarchiso b/archiso/mkarchiso
index 7596673..da1c793 100755
--- a/archiso/mkarchiso
+++ b/archiso/mkarchiso
@@ -6,7 +6,7 @@ set -e -u
 
 # Control the environment
 umask 0022
-export LANG="C"
+export LC_ALL="C"
 export SOURCE_DATE_EPOCH="${SOURCE_DATE_EPOCH:-"$(date +%s)"}"
 
 # Set application name from the script's file name
-- 
cgit v1.2.3-70-g09d2


From 610ff2ac2622a2a3d2c54881210d5cff00b83cfb Mon Sep 17 00:00:00 2001
From: nl6720 <nl6720@gmail.com>
Date: Sat, 3 Jul 2021 10:03:26 +0300
Subject: mkarchiso: improve functions and comments

* Merge _make_efi_dir_on_iso9660 into _make_bootmode_uefi-x64.systemd-boot.eltorito since it's specific to that boot mode.
* Split off FAT image creation into _make_efibootimg, so it can be reused by other functions.
* Add/improve comments to better document what the script does.
---
 archiso/mkarchiso | 138 ++++++++++++++++++++++++++++++++----------------------
 1 file changed, 82 insertions(+), 56 deletions(-)

(limited to 'archiso/mkarchiso')

diff --git a/archiso/mkarchiso b/archiso/mkarchiso
index da1c793..5a83a1f 100755
--- a/archiso/mkarchiso
+++ b/archiso/mkarchiso
@@ -172,6 +172,8 @@ _cleanup_pacstrap_dir() {
     _msg_info "Done!"
 }
 
+# Create a squashfs image and place it in the ISO 9660 file system.
+# $@: options to pass to mksquashfs
 _run_mksquashfs() {
     local image_path="${isofs_dir}/${install_dir}/${arch}/airootfs.sfs"
     if [[ "${quiet}" == "y" ]]; then
@@ -181,7 +183,8 @@ _run_mksquashfs() {
     fi
 }
 
-# Makes a ext4 filesystem inside a SquashFS from a source directory.
+# Create an ext4 image containing the root file system and pack it inside a squashfs image.
+# Save the squashfs image on the ISO 9660 file system.
 _mkairootfs_ext4+squashfs() {
     [[ -e "${pacstrap_dir}" ]] || _msg_error "The path '${pacstrap_dir}' does not exist" 1
 
@@ -206,7 +209,7 @@ _mkairootfs_ext4+squashfs() {
     rm -- "${pacstrap_dir}.img"
 }
 
-# Makes a SquashFS filesystem from a source directory.
+# Create a squashfs image containing the root file system and saves it on the ISO 9660 file system.
 _mkairootfs_squashfs() {
     [[ -e "${pacstrap_dir}" ]] || _msg_error "The path '${pacstrap_dir}' does not exist" 1
 
@@ -215,7 +218,7 @@ _mkairootfs_squashfs() {
     _run_mksquashfs "${pacstrap_dir}"
 }
 
-# Makes an EROFS file system from a source directory.
+# Create an EROFS image containing the root file system and saves it on the ISO 9660 file system.
 _mkairootfs_erofs() {
     local fsuuid
     [[ -e "${pacstrap_dir}" ]] || _msg_error "The path '${pacstrap_dir}' does not exist" 1
@@ -229,6 +232,7 @@ _mkairootfs_erofs() {
     _msg_info "Done!"
 }
 
+# Create checksum file for the rootfs image.
 _mkchecksum() {
     _msg_info "Creating checksum file for self-test..."
     cd -- "${isofs_dir}/${install_dir}/${arch}"
@@ -241,6 +245,7 @@ _mkchecksum() {
     _msg_info "Done!"
 }
 
+# GPG sign the root file system image.
 _mksignature() {
     _msg_info "Signing rootfs image..."
     cd -- "${isofs_dir}/${install_dir}/${arch}"
@@ -255,6 +260,7 @@ _mksignature() {
 }
 
 # Helper function to run functions only one time.
+# $1: function name
 _run_once() {
     if [[ ! -e "${work_dir}/${run_once_mode}.${1}" ]]; then
         "$1"
@@ -262,13 +268,13 @@ _run_once() {
     fi
 }
 
-# Set up custom pacman.conf with custom cache and pacman hook directories
+# Set up custom pacman.conf with custom cache and pacman hook directories.
 _make_pacman_conf() {
     local _cache_dirs _system_cache_dirs _profile_cache_dirs
     _system_cache_dirs="$(pacman-conf CacheDir| tr '\n' ' ')"
     _profile_cache_dirs="$(pacman-conf --config "${pacman_conf}" CacheDir| tr '\n' ' ')"
 
-    # only use the profile's CacheDir, if it is not the default and not the same as the system cache dir
+    # Only use the profile's CacheDir, if it is not the default and not the same as the system cache dir.
     if [[ "${_profile_cache_dirs}" != "/var/cache/pacman/pkg" ]] && \
         [[ "${_system_cache_dirs}" != "${_profile_cache_dirs}" ]]; then
         _cache_dirs="${_profile_cache_dirs}"
@@ -287,7 +293,7 @@ _make_pacman_conf() {
         /\[options\]/a HookDir = ${pacstrap_dir}/etc/pacman.d/hooks/" > "${work_dir}/${buildmode}.pacman.conf"
 }
 
-# Prepare working directory and copy custom airootfs files (airootfs)
+# Prepare working directory and copy custom root file system files.
 _make_custom_airootfs() {
     local passwd=()
     local filename permissions
@@ -320,7 +326,7 @@ _make_custom_airootfs() {
     fi
 }
 
-# Install desired packages to airootfs
+# Install desired packages to the root file system
 _make_packages() {
     _msg_info "Installing packages to '${pacstrap_dir}/'..."
 
@@ -344,7 +350,7 @@ _make_packages() {
     _msg_info "Done! Packages installed successfully."
 }
 
-# Customize installation (airootfs)
+# Customize installation.
 _make_customize_airootfs() {
     local passwd=()
 
@@ -390,7 +396,7 @@ _make_bootmodes() {
     done
 }
 
-# Prepare kernel/initramfs ${install_dir}/boot/
+# Copy kernel and initramfs to ISO 9660
 _make_boot_on_iso9660() {
     local ucode_image
     _msg_info "Preparing kernel and initramfs for the ISO 9660 file system..."
@@ -411,7 +417,7 @@ _make_boot_on_iso9660() {
     _msg_info "Done!"
 }
 
-# Prepare /syslinux for booting from MBR
+# Prepare syslinux for booting from MBR (isohybrid)
 _make_bootmode_bios.syslinux.mbr() {
     _msg_info "Setting up SYSLINUX for BIOS booting from a disk..."
     install -d -m 0755 -- "${isofs_dir}/syslinux"
@@ -451,7 +457,7 @@ _make_bootmode_bios.syslinux.mbr() {
     _msg_info "Done! SYSLINUX set up for BIOS booting from a disk successfully."
 }
 
-# Prepare /syslinux for El-Torito booting
+# Prepare syslinux for El-Torito booting
 _make_bootmode_bios.syslinux.eltorito() {
     _msg_info "Setting up SYSLINUX for BIOS booting from an optical disc..."
     install -d -m 0755 -- "${isofs_dir}/syslinux"
@@ -464,32 +470,7 @@ _make_bootmode_bios.syslinux.eltorito() {
     _msg_info "Done! SYSLINUX set up for BIOS booting from an optical disc successfully."
 }
 
-# Prepare /EFI on ISO-9660
-_make_efi_dir_on_iso9660() {
-    _msg_info "Preparing an /EFI directory for the ISO 9660 file system..."
-    install -d -m 0755 -- "${isofs_dir}/EFI/BOOT"
-    install -m 0644 -- "${pacstrap_dir}/usr/lib/systemd/boot/efi/systemd-bootx64.efi" \
-        "${isofs_dir}/EFI/BOOT/BOOTx64.EFI"
-
-    install -d -m 0755 -- "${isofs_dir}/loader/entries"
-    install -m 0644 -- "${profile}/efiboot/loader/loader.conf" "${isofs_dir}/loader/"
-
-    for _conf in "${profile}/efiboot/loader/entries/"*".conf"; do
-        sed "s|%ARCHISO_LABEL%|${iso_label}|g;
-             s|%INSTALL_DIR%|${install_dir}|g;
-             s|%ARCH%|${arch}|g" \
-            "${_conf}" > "${isofs_dir}/loader/entries/${_conf##*/}"
-    done
-
-    # edk2-shell based UEFI shell
-    # shellx64.efi is picked up automatically when on /
-    if [[ -e "${pacstrap_dir}/usr/share/edk2-shell/x64/Shell_Full.efi" ]]; then
-        install -m 0644 -- "${pacstrap_dir}/usr/share/edk2-shell/x64/Shell_Full.efi" "${isofs_dir}/shellx64.efi"
-    fi
-    _msg_info "Done!"
-}
-
-# Prepare kernel/initramfs on efiboot.img
+# Copy kernel and initramfs to FAT image
 _make_boot_on_fat() {
     local ucode_image all_ucode_images=()
     _msg_info "Preparing kernel and initramfs for the FAT file system..."
@@ -508,9 +489,30 @@ _make_boot_on_fat() {
     _msg_info "Done!"
 }
 
-# Prepare efiboot.img::/EFI for EFI boot mode
+# Create a FAT image (efiboot.img) which will serve as the EFI system partition
+# $1: image size in bytes
+_make_efibootimg() {
+    local imgsize="0"
+
+    # Convert from bytes to KiB and round up to the next full MiB with an additional MiB for reserved sectors.
+    imgsize="$(awk 'function ceil(x){return int(x)+(x>int(x))}
+            function byte_to_kib(x){return x/1024}
+            function mib_to_kib(x){return x*1024}
+            END {print mib_to_kib(ceil((byte_to_kib($1)+1024)/1024))}' <<< "${1}"
+    )"
+    # The FAT image must be created with mkfs.fat not mformat, as some systems have issues with mformat made images:
+    # https://lists.gnu.org/archive/html/grub-devel/2019-04/msg00099.html
+    [[ -e "${work_dir}/efiboot.img" ]] && rm -f -- "${work_dir}/efiboot.img"
+    _msg_info "Creating FAT image of size: ${imgsize} KiB..."
+    mkfs.fat -C -n ARCHISO_EFI "${work_dir}/efiboot.img" "${imgsize}"
+
+    # Create the default/fallback boot path in which a boot loaders will be placed later.
+    mmd -i "${work_dir}/efiboot.img" ::/EFI ::/EFI/BOOT
+}
+
+# Prepare system-boot for booting when written to a disk (isohybrid)
 _make_bootmode_uefi-x64.systemd-boot.esp() {
-    local _file efiboot_imgsize="0"
+    local _file efiboot_imgsize
     local _available_ucodes=()
     _msg_info "Setting up systemd-boot for UEFI booting..."
 
@@ -519,7 +521,7 @@ _make_bootmode_uefi-x64.systemd-boot.esp() {
             _available_ucodes+=("${pacstrap_dir}/boot/${_file}")
         fi
     done
-    # the required image size in KiB (rounded up to the next full MiB with an additional MiB for reserved sectors)
+    # Calculate the required FAT image size in bytes
     efiboot_imgsize="$(du -bc \
         "${pacstrap_dir}/usr/lib/systemd/boot/efi/systemd-bootx64.efi" \
         "${pacstrap_dir}/usr/share/edk2-shell/x64/Shell_Full.efi" \
@@ -527,21 +529,15 @@ _make_bootmode_uefi-x64.systemd-boot.esp() {
         "${pacstrap_dir}/boot/vmlinuz-"* \
         "${pacstrap_dir}/boot/initramfs-"*".img" \
         "${_available_ucodes[@]}" \
-        2>/dev/null | awk 'function ceil(x){return int(x)+(x>int(x))}
-            function byte_to_kib(x){return x/1024}
-            function mib_to_kib(x){return x*1024}
-            END {print mib_to_kib(ceil((byte_to_kib($1)+1024)/1024))}'
-        )"
-    # The FAT image must be created with mkfs.fat not mformat, as some systems have issues with mformat made images:
-    # https://lists.gnu.org/archive/html/grub-devel/2019-04/msg00099.html
-    [[ -e "${work_dir}/efiboot.img" ]] && rm -f -- "${work_dir}/efiboot.img"
-    _msg_info "Creating FAT image of size: ${efiboot_imgsize} KiB..."
-    mkfs.fat -C -n ARCHISO_EFI "${work_dir}/efiboot.img" "$efiboot_imgsize"
+        2>/dev/null | awk 'END { print $1 }')"
+    # Create a FAT image for the EFI system partition
+    _make_efibootimg "$efiboot_imgsize"
 
-    mmd -i "${work_dir}/efiboot.img" ::/EFI ::/EFI/BOOT
+    # Copy systemd-boot EFI binary to the default/fallback boot path
     mcopy -i "${work_dir}/efiboot.img" \
         "${pacstrap_dir}/usr/lib/systemd/boot/efi/systemd-bootx64.efi" ::/EFI/BOOT/BOOTx64.EFI
 
+    # Copy systemd-boot configuration files
     mmd -i "${work_dir}/efiboot.img" ::/loader ::/loader/entries
     mcopy -i "${work_dir}/efiboot.img" "${profile}/efiboot/loader/loader.conf" ::/loader/
     for _conf in "${profile}/efiboot/loader/entries/"*".conf"; do
@@ -557,17 +553,46 @@ _make_bootmode_uefi-x64.systemd-boot.esp() {
             "${pacstrap_dir}/usr/share/edk2-shell/x64/Shell_Full.efi" ::/shellx64.efi
     fi
 
-    # Copy kernel and initramfs
+    # Copy kernel and initramfs to FAT image.
+    # systemd-boot can only access files from the EFI system partition it was launched from.
     _make_boot_on_fat
 
     _msg_info "Done! systemd-boot set up for UEFI booting successfully."
 }
 
-# Prepare efiboot.img::/EFI for "El Torito" EFI boot mode
+# Prepare system-boot for El Torito booting
 _make_bootmode_uefi-x64.systemd-boot.eltorito() {
+    # El Torito UEFI boot requires an image containing the EFI system partition.
+    # uefi-x64.systemd-boot.eltorito has the same requirements as uefi-x64.systemd-boot.esp
     _run_once _make_bootmode_uefi-x64.systemd-boot.esp
-    # Set up /EFI on ISO-9660 to allow preparing an installation medium by manually copying files
-    _run_once _make_efi_dir_on_iso9660
+
+    # Additionally set up system-boot in ISO 9660. This allows creating a medium for the live environment by using
+    # manual partitioning and simply copying the ISO 9660 file system contents.
+    # This is not related to El Torito booting and no firmware uses these files.
+    _msg_info "Preparing an /EFI directory for the ISO 9660 file system..."
+    install -d -m 0755 -- "${isofs_dir}/EFI/BOOT"
+
+    # Copy systemd-boot EFI binary to the default/fallback boot path
+    install -m 0644 -- "${pacstrap_dir}/usr/lib/systemd/boot/efi/systemd-bootx64.efi" \
+        "${isofs_dir}/EFI/BOOT/BOOTx64.EFI"
+
+    # Copy systemd-boot configuration files
+    install -d -m 0755 -- "${isofs_dir}/loader/entries"
+    install -m 0644 -- "${profile}/efiboot/loader/loader.conf" "${isofs_dir}/loader/"
+    for _conf in "${profile}/efiboot/loader/entries/"*".conf"; do
+        sed "s|%ARCHISO_LABEL%|${iso_label}|g;
+             s|%INSTALL_DIR%|${install_dir}|g;
+             s|%ARCH%|${arch}|g" \
+            "${_conf}" > "${isofs_dir}/loader/entries/${_conf##*/}"
+    done
+
+    # edk2-shell based UEFI shell
+    # shellx64.efi is picked up automatically when on /
+    if [[ -e "${pacstrap_dir}/usr/share/edk2-shell/x64/Shell_Full.efi" ]]; then
+        install -m 0644 -- "${pacstrap_dir}/usr/share/edk2-shell/x64/Shell_Full.efi" "${isofs_dir}/shellx64.efi"
+    fi
+
+    _msg_info "Done!"
 }
 
 _validate_requirements_bootmode_bios.syslinux.mbr() {
@@ -609,6 +634,7 @@ _validate_requirements_bootmode_bios.syslinux.mbr() {
 }
 
 _validate_requirements_bootmode_bios.syslinux.eltorito() {
+    # bios.syslinux.eltorito has the exact same requirements as bios.syslinux.mbr
     _validate_requirements_bootmode_bios.syslinux.mbr
 }
 
@@ -772,7 +798,7 @@ _add_xorrisofs_options_bios.syslinux.eltorito() {
     )
 }
 
-# SYSLINUX MBR
+# SYSLINUX MBR (isohybrid)
 _add_xorrisofs_options_bios.syslinux.mbr() {
     xorrisofs_options+=(
         # SYSLINUX MBR bootstrap code; does not work without "-eltorito-boot syslinux/isolinux.bin"
-- 
cgit v1.2.3-70-g09d2


From 0fa1c0e945ba1adcc21591edcf71a773a4d48f64 Mon Sep 17 00:00:00 2001
From: David Runge <dvzrv@archlinux.org>
Date: Thu, 29 Jul 2021 21:09:30 +0200
Subject: mkarchiso: Do not run _build_iso_base once

archiso/mkarchiso:
Do not run `_build_iso_base` with `_run_once`, as it sets variables which are important to functions that are called
after it.
---
 archiso/mkarchiso | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'archiso/mkarchiso')

diff --git a/archiso/mkarchiso b/archiso/mkarchiso
index 5a83a1f..3f8c67e 100755
--- a/archiso/mkarchiso
+++ b/archiso/mkarchiso
@@ -1241,7 +1241,7 @@ _build_buildmode_bootstrap() {
 _build_buildmode_netboot() {
     local run_once_mode="${buildmode}"
 
-    _run_once _build_iso_base
+    _build_iso_base
     if [[ -v cert_list ]]; then
         _run_once _sign_netboot_artifacts
     fi
@@ -1252,7 +1252,7 @@ _build_buildmode_netboot() {
 _build_buildmode_iso() {
     local image_name="${iso_name}-${iso_version}-${arch}.iso"
     local run_once_mode="${buildmode}"
-    _run_once _build_iso_base
+    _build_iso_base
     _run_once _build_iso_image
 }
 
-- 
cgit v1.2.3-70-g09d2


From 6185448477313e304a8ab662e5857b50a515d1fa Mon Sep 17 00:00:00 2001
From: nl6720 <nl6720@gmail.com>
Date: Tue, 3 Aug 2021 11:56:08 +0300
Subject: mkarchiso: copy files to ext4 image using mkfs.ext4's -d option
 instead of mounting the file system

mkfs.ext4 with its -d option can "copy the contents of the given directory into the root directory of the filesystem".
This allows to get rid of the last directly used mount and umount commands in mkarchiso.

Additionally try to make the ext4 image somewhat reproducible by setting E2FSPROGS_FAKE_TIME to SOURCE_DATE_EPOCH, clearing the UUID and using a reproducible hash seed.
See https://git.kernel.org/pub/scm/fs/ext2/e2fsprogs.git/commit/?id=e1f7100643a46456be107b33098f6034b0835e6d .

Place mkfs.ext4 options in an array to avoid duplicating the command.

Related to #40.
---
 archiso/mkarchiso | 44 ++++++++++++++++----------------------------
 1 file changed, 16 insertions(+), 28 deletions(-)

(limited to 'archiso/mkarchiso')

diff --git a/archiso/mkarchiso b/archiso/mkarchiso
index 3f8c67e..8b43f75 100755
--- a/archiso/mkarchiso
+++ b/archiso/mkarchiso
@@ -67,22 +67,6 @@ _msg_error() {
     fi
 }
 
-_mount_airootfs() {
-    trap "_umount_airootfs" EXIT HUP INT TERM
-    install -d -m 0755 -- "${work_dir}/mnt/airootfs"
-    _msg_info "Mounting '${pacstrap_dir}.img' on '${work_dir}/mnt/airootfs'..."
-    mount -- "${pacstrap_dir}.img" "${work_dir}/mnt/airootfs"
-    _msg_info "Done!"
-}
-
-_umount_airootfs() {
-    _msg_info "Unmounting '${work_dir}/mnt/airootfs'..."
-    umount -d -- "${work_dir}/mnt/airootfs"
-    _msg_info "Done!"
-    rmdir -- "${work_dir}/mnt/airootfs"
-    trap - EXIT HUP INT TERM
-}
-
 # Show help usage, with an exit status.
 # $1: exit status number.
 _usage() {
@@ -186,22 +170,26 @@ _run_mksquashfs() {
 # Create an ext4 image containing the root file system and pack it inside a squashfs image.
 # Save the squashfs image on the ISO 9660 file system.
 _mkairootfs_ext4+squashfs() {
+    local ext4_hash_seed mkfs_ext4_options=()
     [[ -e "${pacstrap_dir}" ]] || _msg_error "The path '${pacstrap_dir}' does not exist" 1
 
-    _msg_info "Creating ext4 image of 32 GiB..."
-    if [[ "${quiet}" == "y" ]]; then
-        mkfs.ext4 -q -O '^has_journal,^resize_inode' -E 'lazy_itable_init=0' -m 0 -F -- "${pacstrap_dir}.img" 32G
-    else
-        mkfs.ext4 -O '^has_journal,^resize_inode' -E 'lazy_itable_init=0' -m 0 -F -- "${pacstrap_dir}.img" 32G
-    fi
+    _msg_info "Creating ext4 image of 32 GiB and copying '${pacstrap_dir}/' to it..."
+
+    ext4_hash_seed="$(uuidgen --sha1 --namespace 93a870ff-8565-4cf3-a67b-f47299271a96 \
+        --name "${SOURCE_DATE_EPOCH} ext4 hash seed")"
+    mkfs_ext4_options=(
+        '-d' "${pacstrap_dir}"
+        '-O' '^has_journal,^resize_inode'
+        '-E' "lazy_itable_init=0,root_owner=0:0,hash_seed=${ext4_hash_seed}"
+        '-m' '0'
+        '-F'
+        '-U' 'clear'
+    )
+    [[ ! "${quiet}" == "y" ]] || mkfs_ext4_options+=('-q')
+    E2FSPROGS_FAKE_TIME="${SOURCE_DATE_EPOCH}" mkfs.ext4 "${mkfs_ext4_options[@]}" -- "${pacstrap_dir}.img" 32G
     tune2fs -c 0 -i 0 -- "${pacstrap_dir}.img" > /dev/null
     _msg_info "Done!"
-    _mount_airootfs
-    _msg_info "Copying '${pacstrap_dir}/' to '${work_dir}/mnt/airootfs/'..."
-    cp -aT -- "${pacstrap_dir}/" "${work_dir}/mnt/airootfs/"
-    chown -- 0:0 "${work_dir}/mnt/airootfs/"
-    _msg_info "Done!"
-    _umount_airootfs
+
     install -d -m 0755 -- "${isofs_dir}/${install_dir}/${arch}"
     _msg_info "Creating SquashFS image, this may take some time..."
     _run_mksquashfs "${pacstrap_dir}.img"
-- 
cgit v1.2.3-70-g09d2


From b040ef1774ed3f3755128b18fdd5ba4eb2598794 Mon Sep 17 00:00:00 2001
From: nl6720 <nl6720@gmail.com>
Date: Tue, 3 Aug 2021 12:04:11 +0300
Subject: mkarchiso: ensure there are no existing image files before trying to
 create them

This could prevent a few issues when creating an image file when re-running mkarchiso after a failure.

Remove useless test before running rm -f. The command will always succeed.
---
 archiso/mkarchiso | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

(limited to 'archiso/mkarchiso')

diff --git a/archiso/mkarchiso b/archiso/mkarchiso
index 8b43f75..e726e0e 100755
--- a/archiso/mkarchiso
+++ b/archiso/mkarchiso
@@ -160,6 +160,7 @@ _cleanup_pacstrap_dir() {
 # $@: options to pass to mksquashfs
 _run_mksquashfs() {
     local image_path="${isofs_dir}/${install_dir}/${arch}/airootfs.sfs"
+    rm -f -- "${image_path}"
     if [[ "${quiet}" == "y" ]]; then
         mksquashfs "$@" "${image_path}" -noappend "${airootfs_image_tool_options[@]}" -no-progress > /dev/null
     else
@@ -186,6 +187,7 @@ _mkairootfs_ext4+squashfs() {
         '-U' 'clear'
     )
     [[ ! "${quiet}" == "y" ]] || mkfs_ext4_options+=('-q')
+    rm -f -- "${pacstrap_dir}.img"
     E2FSPROGS_FAKE_TIME="${SOURCE_DATE_EPOCH}" mkfs.ext4 "${mkfs_ext4_options[@]}" -- "${pacstrap_dir}.img" 32G
     tune2fs -c 0 -i 0 -- "${pacstrap_dir}.img" > /dev/null
     _msg_info "Done!"
@@ -213,6 +215,7 @@ _mkairootfs_erofs() {
 
     install -d -m 0755 -- "${isofs_dir}/${install_dir}/${arch}"
     local image_path="${isofs_dir}/${install_dir}/${arch}/airootfs.erofs"
+    rm -f -- "${image_path}"
     # Generate reproducible file system UUID from SOURCE_DATE_EPOCH
     fsuuid="$(uuidgen --sha1 --namespace 93a870ff-8565-4cf3-a67b-f47299271a96 --name "${SOURCE_DATE_EPOCH}")"
     _msg_info "Creating EROFS image, this may take some time..."
@@ -490,7 +493,7 @@ _make_efibootimg() {
     )"
     # The FAT image must be created with mkfs.fat not mformat, as some systems have issues with mformat made images:
     # https://lists.gnu.org/archive/html/grub-devel/2019-04/msg00099.html
-    [[ -e "${work_dir}/efiboot.img" ]] && rm -f -- "${work_dir}/efiboot.img"
+    rm -f -- "${work_dir}/efiboot.img"
     _msg_info "Creating FAT image of size: ${imgsize} KiB..."
     mkfs.fat -C -n ARCHISO_EFI "${work_dir}/efiboot.img" "${imgsize}"
 
@@ -903,6 +906,7 @@ _build_iso_image() {
         typeset -f "_add_xorrisofs_options_${bootmode}" &> /dev/null && "_add_xorrisofs_options_${bootmode}"
     done
 
+    rm -f -- "${out_dir}/${image_name}"
     _msg_info "Creating ISO image..."
     xorriso -as mkisofs \
             -iso-level 3 \
-- 
cgit v1.2.3-70-g09d2


From 0a58431dde33d9f5a1d63fce93ba9e1b4b783412 Mon Sep 17 00:00:00 2001
From: nl6720 <nl6720@gmail.com>
Date: Sun, 15 Aug 2021 10:54:17 +0300
Subject: mkarchiso: put version files in netboot artifacts

Fixes #147.
---
 archiso/mkarchiso | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'archiso/mkarchiso')

diff --git a/archiso/mkarchiso b/archiso/mkarchiso
index e726e0e..267804a 100755
--- a/archiso/mkarchiso
+++ b/archiso/mkarchiso
@@ -1137,7 +1137,7 @@ _make_version() {
     rm -f -- "${pacstrap_dir}/version"
     printf '%s\n' "${iso_version}" > "${pacstrap_dir}/version"
 
-    if [[ "${buildmode}" == "iso" ]]; then
+    if [[ "${buildmode}" == @("iso"|"netboot") ]]; then
         install -d -m 0755 -- "${isofs_dir}/${install_dir}"
         # Write version file to ISO 9660
         printf '%s\n' "${iso_version}" > "${isofs_dir}/${install_dir}/version"
-- 
cgit v1.2.3-70-g09d2


From ea9572b98e7648bc090e240798244656662e2a09 Mon Sep 17 00:00:00 2001
From: nl6720 <nl6720@gmail.com>
Date: Sat, 7 Aug 2021 12:48:23 +0300
Subject: mkarchiso: add some sane gpg options to override those set in user's
 gpg.conf

* Add --batch, since gpg is run in a script.
* Add --no-armor (this is the default). Armored output provides no benifit here.
* Add --no-include-key-block (this is the default). There is no need to have the gpg key in the signature. The mkinitcpio hook will verify the signature against the included keyring.

Remove the output files before running gpg. Otherwise gpg --batch will fail if they exist.
---
 archiso/mkarchiso | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

(limited to 'archiso/mkarchiso')

diff --git a/archiso/mkarchiso b/archiso/mkarchiso
index 267804a..0a46fd6 100755
--- a/archiso/mkarchiso
+++ b/archiso/mkarchiso
@@ -238,15 +238,17 @@ _mkchecksum() {
 
 # GPG sign the root file system image.
 _mksignature() {
+    local airootfs_image_filename
     _msg_info "Signing rootfs image..."
-    cd -- "${isofs_dir}/${install_dir}/${arch}"
-    # always use the .sig file extension, as that is what mkinitcpio-archiso's hooks expect
     if [[ -e "${isofs_dir}/${install_dir}/${arch}/airootfs.sfs" ]]; then
-        gpg --output airootfs.sfs.sig --detach-sign --default-key "${gpg_key}" airootfs.sfs
+        airootfs_image_filename="${isofs_dir}/${install_dir}/${arch}/airootfs.sfs"
     elif [[ -e "${isofs_dir}/${install_dir}/${arch}/airootfs.erofs" ]]; then
-        gpg --output airootfs.erofs.sig --detach-sign --default-key "${gpg_key}" airootfs.erofs
+        airootfs_image_filename="${isofs_dir}/${install_dir}/${arch}/airootfs.erofs"
     fi
-    cd -- "${OLDPWD}"
+    rm -f -- "${airootfs_image_filename}.sig"
+    # always use the .sig file extension, as that is what mkinitcpio-archiso's hooks expect
+    gpg --batch --no-armor --no-include-key-block --output "${airootfs_image_filename}.sig" --detach-sign \
+        --default-key "${gpg_key}" "${airootfs_image_filename}"
     _msg_info "Done!"
 }
 
@@ -1126,7 +1128,8 @@ _set_overrides() {
 }
 
 _export_gpg_publickey() {
-    gpg --batch --output "${work_dir}/pubkey.gpg" --export "${gpg_key}"
+    rm -f -- "${work_dir}/pubkey.gpg"
+    gpg --batch --no-armor --output "${work_dir}/pubkey.gpg" --export "${gpg_key}"
 }
 
 _make_version() {
-- 
cgit v1.2.3-70-g09d2


From 59dffcf11a3e7d55e4d9171ba2b4a2d0bd262368 Mon Sep 17 00:00:00 2001
From: nl6720 <nl6720@gmail.com>
Date: Tue, 3 Aug 2021 21:12:25 +0300
Subject: mkarchiso: support setting gpg sender

Add new -G option to set gpg's --sender. This allows to see who signed the rootfs image without needing to import the gpg key from the keyring in initramfs.
---
 archiso/mkarchiso | 17 +++++++++++++----
 1 file changed, 13 insertions(+), 4 deletions(-)

(limited to 'archiso/mkarchiso')

diff --git a/archiso/mkarchiso b/archiso/mkarchiso
index 0a46fd6..a77d3d9 100755
--- a/archiso/mkarchiso
+++ b/archiso/mkarchiso
@@ -19,6 +19,7 @@ quiet=""
 work_dir=""
 out_dir=""
 gpg_key=""
+gpg_sender=""
 iso_name=""
 iso_label=""
 iso_publisher=""
@@ -88,7 +89,10 @@ usage: ${app_name} [options] <profile_dir>
                       Multiple files are provided as quoted, space delimited list.
                       The first file is considered as the signing certificate,
                       the second as the key.
-     -g <gpg_key>     Set the PGP key ID to be used for signing the rootfs image
+     -g <gpg_key>     Set the PGP key ID to be used for signing the rootfs image.
+                      Passed to gpg as the value for --default-key
+     -G <mbox>        Set the PGP signer (must include an email address)
+                      Passed to gpg as the value for --sender
      -h               This message
      -m [mode ..]     Build mode(s) to use (valid modes are: 'bootstrap', 'iso' and 'netboot').
                       Multiple build modes are provided as quoted, space delimited list.
@@ -119,6 +123,7 @@ _show_config() {
     _msg_info "       Current build mode:   ${buildmode}"
     _msg_info "              Build modes:   ${buildmodes[*]}"
     _msg_info "                  GPG key:   ${gpg_key:-None}"
+    _msg_info "               GPG signer:   ${gpg_sender:-None}"
     _msg_info "Code signing certificates:   ${cert_list[*]}"
     _msg_info "                  Profile:   ${profile}"
     _msg_info "Pacman configuration file:   ${pacman_conf}"
@@ -238,7 +243,7 @@ _mkchecksum() {
 
 # GPG sign the root file system image.
 _mksignature() {
-    local airootfs_image_filename
+    local airootfs_image_filename gpg_options=()
     _msg_info "Signing rootfs image..."
     if [[ -e "${isofs_dir}/${install_dir}/${arch}/airootfs.sfs" ]]; then
         airootfs_image_filename="${isofs_dir}/${install_dir}/${arch}/airootfs.sfs"
@@ -246,9 +251,11 @@ _mksignature() {
         airootfs_image_filename="${isofs_dir}/${install_dir}/${arch}/airootfs.erofs"
     fi
     rm -f -- "${airootfs_image_filename}.sig"
+    # Add gpg sender option if the value is provided
+    [[ -z "${gpg_sender}" ]] || gpg_options+=('--sender' "${gpg_sender}")
     # always use the .sig file extension, as that is what mkinitcpio-archiso's hooks expect
     gpg --batch --no-armor --no-include-key-block --output "${airootfs_image_filename}.sig" --detach-sign \
-        --default-key "${gpg_key}" "${airootfs_image_filename}"
+        --default-key "${gpg_key}" "${gpg_options[@]}" "${airootfs_image_filename}"
     _msg_info "Done!"
 }
 
@@ -1111,6 +1118,7 @@ _set_overrides() {
         install_dir="${app_name}"
     fi
     [[ ! -v override_gpg_key ]] || gpg_key="$override_gpg_key"
+    [[ ! -v override_gpg_sender ]] || gpg_sender="$override_gpg_sender"
     if [[ -v override_cert_list ]]; then
         sign_netboot_artifacts="y"
     fi
@@ -1261,7 +1269,7 @@ _build() {
     done
 }
 
-while getopts 'c:p:C:L:P:A:D:w:m:o:g:vh?' arg; do
+while getopts 'c:p:C:L:P:A:D:w:m:o:g:G:vh?' arg; do
     case "${arg}" in
         p) read -r -a override_pkg_list <<< "${OPTARG}" ;;
         C) override_pacman_conf="${OPTARG}" ;;
@@ -1274,6 +1282,7 @@ while getopts 'c:p:C:L:P:A:D:w:m:o:g:vh?' arg; do
         m) read -r -a override_buildmodes <<< "${OPTARG}" ;;
         o) override_out_dir="${OPTARG}" ;;
         g) override_gpg_key="${OPTARG}" ;;
+        G) override_gpg_sender="${OPTARG}" ;;
         v) override_quiet="n" ;;
         h|?) _usage 0 ;;
         *)
-- 
cgit v1.2.3-70-g09d2


From 8d18d8f745b6afae88c896f432b2cfd81c6e134a Mon Sep 17 00:00:00 2001
From: nl6720 <nl6720@gmail.com>
Date: Tue, 24 Aug 2021 18:57:27 +0300
Subject: mkarchiso: fix unbound variable errors in _validate_options

$pkg_list_from_file and $bootstrap_pkg_list_from_file are arrays, they must be referenced as such. Fixes https://bugs.archlinux.org/task/71852.

Remove quotes from arithmetic expressions.
---
 archiso/mkarchiso | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'archiso/mkarchiso')

diff --git a/archiso/mkarchiso b/archiso/mkarchiso
index a77d3d9..e2b6674 100755
--- a/archiso/mkarchiso
+++ b/archiso/mkarchiso
@@ -978,7 +978,7 @@ _validate_options() {
     if [[ -e "${packages}" ]]; then
         mapfile -t pkg_list_from_file < <(sed '/^[[:blank:]]*#.*/d;s/#.*//;/^[[:blank:]]*$/d' "${packages}")
         pkg_list+=("${pkg_list_from_file[@]}")
-        if (( ${#pkg_list_from_file} < 1 )); then
+        if (( ${#pkg_list_from_file[@]} < 1 )); then
             (( validation_error=validation_error+1 ))
             _msg_error "No package specified in '${packages}'." 0
         fi
@@ -993,7 +993,7 @@ _validate_options() {
             mapfile -t bootstrap_pkg_list_from_file < \
                 <(sed '/^[[:blank:]]*#.*/d;s/#.*//;/^[[:blank:]]*$/d' "${bootstrap_packages}")
             bootstrap_pkg_list+=("${bootstrap_pkg_list_from_file[@]}")
-            if (( ${#bootstrap_pkg_list_from_file} < 1 )); then
+            if (( ${#bootstrap_pkg_list_from_file[@]} < 1 )); then
                 (( validation_error=validation_error+1 ))
                 _msg_error "No package specified in '${bootstrap_packages}'." 0
             fi
@@ -1014,7 +1014,7 @@ _validate_options() {
         done
         cert_list=("${_override_cert_list[@]}")
         # Check if there are at least two certificate files
-        if (( "${#cert_list[@]}" < 2 )); then
+        if (( ${#cert_list[@]} < 2 )); then
             (( validation_error=validation_error+1 ))
             _msg_error "Two certificates are required for codesigning, but '${cert_list[*]}' is provided." 0
         fi
@@ -1074,7 +1074,7 @@ _validate_options() {
 _set_overrides() {
     # Set variables that have command line overrides
     [[ ! -v override_buildmodes ]] || buildmodes=("${override_buildmodes[@]}")
-    if (( "${#buildmodes[@]}" < 1 )); then
+    if (( ${#buildmodes[@]} < 1 )); then
         buildmodes+=('iso')
     fi
     if [[ -v override_work_dir ]]; then
-- 
cgit v1.2.3-70-g09d2


From f3959d6ef054af629d162052fd42f3d9fb2512dd Mon Sep 17 00:00:00 2001
From: nl6720 <nl6720@gmail.com>
Date: Tue, 24 Aug 2021 19:19:20 +0300
Subject: mkarchiso: split out build mode specific checks from
 _validate_options to _validate_requirements_buildmode_*

The bootstrap build mode does not use packages.${arch}, ${bootmodes[@]} or $airootfs_image_type so there's no need to validate them.
Requirements common to iso and netboot are checked with the _validate_common_requirements_buildmode_iso_netboot function.

Fixes #149.

* Rename _validate_requirements_buildmode_all to _validate_common_requirements_buildmode_all to prevent potential conflicts since we are using _validate_requirements_buildmode_${_buildmode} to run the functions.
* Improve searching in an array. See https://stackoverflow.com/a/15394738.
---
 archiso/mkarchiso | 163 ++++++++++++++++++++++++++++--------------------------
 1 file changed, 86 insertions(+), 77 deletions(-)

(limited to 'archiso/mkarchiso')

diff --git a/archiso/mkarchiso b/archiso/mkarchiso
index e2b6674..fb601c3 100755
--- a/archiso/mkarchiso
+++ b/archiso/mkarchiso
@@ -747,7 +747,7 @@ _validate_requirements_airootfs_image_type_erofs() {
     fi
 }
 
-_validate_requirements_buildmode_all() {
+_validate_common_requirements_buildmode_all() {
     if ! command -v pacman &> /dev/null; then
         (( validation_error=validation_error+1 ))
         _msg_error "Validating build mode '${_buildmode}': pacman is not available on this host. Install 'pacman'!" 0
@@ -763,15 +763,76 @@ _validate_requirements_buildmode_all() {
 }
 
 _validate_requirements_buildmode_bootstrap() {
-    _validate_requirements_buildmode_all
+    local bootstrap_pkg_list_from_file=()
+
+    # Check if packages for the bootstrap image are specified
+    if [[ -e "${bootstrap_packages}" ]]; then
+        mapfile -t bootstrap_pkg_list_from_file < \
+            <(sed '/^[[:blank:]]*#.*/d;s/#.*//;/^[[:blank:]]*$/d' "${bootstrap_packages}")
+        bootstrap_pkg_list+=("${bootstrap_pkg_list_from_file[@]}")
+        if (( ${#bootstrap_pkg_list_from_file[@]} < 1 )); then
+            (( validation_error=validation_error+1 ))
+            _msg_error "No package specified in '${bootstrap_packages}'." 0
+        fi
+    else
+        (( validation_error=validation_error+1 ))
+        _msg_error "Bootstrap packages file '${bootstrap_packages}' does not exist." 0
+    fi
+
+    _validate_common_requirements_buildmode_all
     if ! command -v bsdtar &> /dev/null; then
         (( validation_error=validation_error+1 ))
         _msg_error "Validating build mode '${_buildmode}': bsdtar is not available on this host. Install 'libarchive'!" 0
     fi
 }
 
+_validate_common_requirements_buildmode_iso_netboot() {
+    local bootmode
+    local pkg_list_from_file=()
+
+    # Check if the package list file exists and read packages from it
+    if [[ -e "${packages}" ]]; then
+        mapfile -t pkg_list_from_file < <(sed '/^[[:blank:]]*#.*/d;s/#.*//;/^[[:blank:]]*$/d' "${packages}")
+        pkg_list+=("${pkg_list_from_file[@]}")
+        if (( ${#pkg_list_from_file[@]} < 1 )); then
+            (( validation_error=validation_error+1 ))
+            _msg_error "No package specified in '${packages}'." 0
+        fi
+    else
+        (( validation_error=validation_error+1 ))
+        _msg_error "Packages file '${packages}' does not exist." 0
+    fi
+
+    # Check if the specified bootmodes are supported
+    for bootmode in "${bootmodes[@]}"; do
+        if typeset -f "_make_bootmode_${bootmode}" &> /dev/null; then
+            if typeset -f "_validate_requirements_bootmode_${bootmode}" &> /dev/null; then
+                "_validate_requirements_bootmode_${bootmode}"
+            else
+                _msg_warning "Function '_validate_requirements_bootmode_${bootmode}' does not exist. Validating the requirements of '${bootmode}' boot mode will not be possible."
+            fi
+        else
+            (( validation_error=validation_error+1 ))
+            _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
+            "_validate_requirements_airootfs_image_type_${airootfs_image_type}"
+        else
+            _msg_warning "Function '_validate_requirements_airootfs_image_type_${airootfs_image_type}' does not exist. Validating the requirements of '${airootfs_image_type}' airootfs image type will not be possible."
+        fi
+    else
+        (( validation_error=validation_error+1 ))
+        _msg_error "Unsupported image type: '${airootfs_image_type}'" 0
+    fi
+}
+
 _validate_requirements_buildmode_iso() {
-    _validate_requirements_buildmode_all
+    _validate_common_requirements_buildmode_iso_netboot
+    _validate_common_requirements_buildmode_all
     if ! command -v awk &> /dev/null; then
         (( validation_error=validation_error+1 ))
         _msg_error "Validating build mode '${_buildmode}': awk is not available on this host. Install 'awk'!" 0
@@ -779,7 +840,27 @@ _validate_requirements_buildmode_iso() {
 }
 
 _validate_requirements_buildmode_netboot() {
-    _validate_requirements_buildmode_all
+    local _override_cert_list=()
+
+    if [[ "${sign_netboot_artifacts}" == "y" ]]; then
+        # Check if the certificate files exist
+        for _cert in "${cert_list[@]}"; do
+            if [[ -e "${_cert}" ]]; then
+                _override_cert_list+=("$(realpath -- "${_cert}")")
+            else
+                (( validation_error=validation_error+1 ))
+                _msg_error "File '${_cert}' does not exist." 0
+            fi
+        done
+        cert_list=("${_override_cert_list[@]}")
+        # Check if there are at least two certificate files
+        if (( ${#cert_list[@]} < 2 )); then
+            (( validation_error=validation_error+1 ))
+            _msg_error "Two certificates are required for codesigning, but '${cert_list[*]}' is provided." 0
+        fi
+    fi
+    _validate_common_requirements_buildmode_iso_netboot
+    _validate_common_requirements_buildmode_all
     if ! command -v openssl &> /dev/null; then
         (( validation_error=validation_error+1 ))
         _msg_error "Validating build mode '${_buildmode}': openssl is not available on this host. Install 'openssl'!" 0
@@ -968,57 +1049,10 @@ _read_profile() {
 
 # Validate set options
 _validate_options() {
-    local validation_error=0 bootmode _cert _buildmode
-    local pkg_list_from_file=()
-    local bootstrap_pkg_list_from_file=()
-    local _override_cert_list=()
+    local validation_error=0 _buildmode
 
     _msg_info "Validating options..."
-    # Check if the package list file exists and read packages from it
-    if [[ -e "${packages}" ]]; then
-        mapfile -t pkg_list_from_file < <(sed '/^[[:blank:]]*#.*/d;s/#.*//;/^[[:blank:]]*$/d' "${packages}")
-        pkg_list+=("${pkg_list_from_file[@]}")
-        if (( ${#pkg_list_from_file[@]} < 1 )); then
-            (( validation_error=validation_error+1 ))
-            _msg_error "No package specified in '${packages}'." 0
-        fi
-    else
-        (( validation_error=validation_error+1 ))
-        _msg_error "Packages file '${packages}' does not exist." 0
-    fi
 
-    # Check if packages for the bootstrap image are specified
-    if [[ "${buildmodes[*]}" == *bootstrap* ]]; then
-        if [[ -e "${bootstrap_packages}" ]]; then
-            mapfile -t bootstrap_pkg_list_from_file < \
-                <(sed '/^[[:blank:]]*#.*/d;s/#.*//;/^[[:blank:]]*$/d' "${bootstrap_packages}")
-            bootstrap_pkg_list+=("${bootstrap_pkg_list_from_file[@]}")
-            if (( ${#bootstrap_pkg_list_from_file[@]} < 1 )); then
-                (( validation_error=validation_error+1 ))
-                _msg_error "No package specified in '${bootstrap_packages}'." 0
-            fi
-        else
-            (( validation_error=validation_error+1 ))
-            _msg_error "Bootstrap packages file '${bootstrap_packages}' does not exist." 0
-        fi
-    fi
-    if [[ "${sign_netboot_artifacts}" == "y" ]]; then
-        # Check if the certificate files exist
-        for _cert in "${cert_list[@]}"; do
-            if [[ -e "${_cert}" ]]; then
-                _override_cert_list+=("$(realpath -- "${_cert}")")
-            else
-                (( validation_error=validation_error+1 ))
-                _msg_error "File '${_cert}' does not exist." 0
-            fi
-        done
-        cert_list=("${_override_cert_list[@]}")
-        # Check if there are at least two certificate files
-        if (( ${#cert_list[@]} < 2 )); then
-            (( validation_error=validation_error+1 ))
-            _msg_error "Two certificates are required for codesigning, but '${cert_list[*]}' is provided." 0
-        fi
-    fi
     # Check if pacman configuration file exists
     if [[ ! -e "${pacman_conf}" ]]; then
         (( validation_error=validation_error+1 ))
@@ -1039,31 +1073,6 @@ _validate_options() {
         fi
     done
 
-    # Check if the specified bootmodes are supported
-    for bootmode in "${bootmodes[@]}"; do
-        if typeset -f "_make_bootmode_${bootmode}" &> /dev/null; then
-            if typeset -f "_validate_requirements_bootmode_${bootmode}" &> /dev/null; then
-                "_validate_requirements_bootmode_${bootmode}"
-            else
-                _msg_warning "Function '_validate_requirements_bootmode_${bootmode}' does not exist. Validating the requirements of '${bootmode}' boot mode will not be possible."
-            fi
-        else
-            (( validation_error=validation_error+1 ))
-            _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
-            "_validate_requirements_airootfs_image_type_${airootfs_image_type}"
-        else
-            _msg_warning "Function '_validate_requirements_airootfs_image_type_${airootfs_image_type}' does not exist. Validating the requirements of '${airootfs_image_type}' airootfs image type will not be possible."
-        fi
-    else
-        (( validation_error=validation_error+1 ))
-        _msg_error "Unsupported image type: '${airootfs_image_type}'" 0
-    fi
-
     if (( validation_error )); then
         _msg_error "${validation_error} errors were encountered while validating the profile. Aborting." 1
     fi
-- 
cgit v1.2.3-70-g09d2


From d2315bc98d1e5c07e9d88247d0ad8259677fbac8 Mon Sep 17 00:00:00 2001
From: nl6720 <nl6720@gmail.com>
Date: Tue, 24 Aug 2021 21:16:42 +0300
Subject: mkarchiso: error out of iso and netboot build modes if no boot modes
 are specified

---
 archiso/mkarchiso | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'archiso/mkarchiso')

diff --git a/archiso/mkarchiso b/archiso/mkarchiso
index fb601c3..6181af2 100755
--- a/archiso/mkarchiso
+++ b/archiso/mkarchiso
@@ -804,6 +804,10 @@ _validate_common_requirements_buildmode_iso_netboot() {
     fi
 
     # Check if the specified bootmodes are supported
+    if (( ${#bootmodes[@]} < 1 )); then
+        (( validation_error=validation_error+1 ))
+        _msg_error "No boot modes specified in '${profile}/profiledef.sh'." 0
+    fi
     for bootmode in "${bootmodes[@]}"; do
         if typeset -f "_make_bootmode_${bootmode}" &> /dev/null; then
             if typeset -f "_validate_requirements_bootmode_${bootmode}" &> /dev/null; then
-- 
cgit v1.2.3-70-g09d2


From f8862c26219774e7e900d2464dd0ff51cbbd6311 Mon Sep 17 00:00:00 2001
From: nl6720 <nl6720@gmail.com>
Date: Sun, 5 Sep 2021 12:20:56 +0300
Subject: mkarchiso: replace external date command with printf

printf is a bash builtin, so by using it an external command can be avoided.
Due to the differences between date(1) and strftime(3), the time zone output will not contain a colon anymore. Fortunately, that is still a supported format according to https://en.wikipedia.org/wiki/ISO_8601#Time_offsets_from_UTC .
---
 archiso/mkarchiso | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'archiso/mkarchiso')

diff --git a/archiso/mkarchiso b/archiso/mkarchiso
index 6181af2..9a310c7 100755
--- a/archiso/mkarchiso
+++ b/archiso/mkarchiso
@@ -7,7 +7,8 @@ set -e -u
 # Control the environment
 umask 0022
 export LC_ALL="C"
-export SOURCE_DATE_EPOCH="${SOURCE_DATE_EPOCH:-"$(date +%s)"}"
+[[ -v SOURCE_DATE_EPOCH ]] || printf -v SOURCE_DATE_EPOCH '%(%s)T' -1
+export SOURCE_DATE_EPOCH
 
 # Set application name from the script's file name
 app_name="${0##*/}"
@@ -113,7 +114,7 @@ ENDUSAGETEXT
 # Shows configuration options.
 _show_config() {
     local build_date
-    build_date="$(date --utc --iso-8601=seconds -d "@${SOURCE_DATE_EPOCH}")"
+    printf -v build_date '%(%FT%R%z)T' "${SOURCE_DATE_EPOCH}"
     _msg_info "${app_name} configuration settings"
     _msg_info "             Architecture:   ${arch}"
     _msg_info "        Working directory:   ${work_dir}"
-- 
cgit v1.2.3-70-g09d2


From 662027ef80998416950b08dd85f747459b4635f1 Mon Sep 17 00:00:00 2001
From: nl6720 <nl6720@gmail.com>
Date: Thu, 16 Sep 2021 11:47:43 +0300
Subject: mkarchiso: do not require setting boot modes when building only
 netboot artifacts

netboot does not need any of the boot loaders or their files.

Fixes #150.
---
 archiso/mkarchiso | 40 ++++++++++++++++++++++------------------
 1 file changed, 22 insertions(+), 18 deletions(-)

(limited to 'archiso/mkarchiso')

diff --git a/archiso/mkarchiso b/archiso/mkarchiso
index 9a310c7..34c3e24 100755
--- a/archiso/mkarchiso
+++ b/archiso/mkarchiso
@@ -132,7 +132,7 @@ _show_config() {
     _msg_info "         ISO volume label:   ${iso_label}"
     _msg_info "            ISO publisher:   ${iso_publisher}"
     _msg_info "          ISO application:   ${iso_application}"
-    _msg_info "               Boot modes:   ${bootmodes[*]}"
+    _msg_info "               Boot modes:   ${bootmodes[*]:-None}"
     _msg_info "            Packages File:   ${buildmode_packages}"
     _msg_info "                 Packages:   ${buildmode_pkg_list[*]}"
 }
@@ -804,6 +804,22 @@ _validate_common_requirements_buildmode_iso_netboot() {
         _msg_error "Packages file '${packages}' does not exist." 0
     fi
 
+    # 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
+            "_validate_requirements_airootfs_image_type_${airootfs_image_type}"
+        else
+            _msg_warning "Function '_validate_requirements_airootfs_image_type_${airootfs_image_type}' does not exist. Validating the requirements of '${airootfs_image_type}' airootfs image type will not be possible."
+        fi
+    else
+        (( validation_error=validation_error+1 ))
+        _msg_error "Unsupported image type: '${airootfs_image_type}'" 0
+    fi
+}
+
+_validate_requirements_buildmode_iso() {
+    _validate_common_requirements_buildmode_iso_netboot
+    _validate_common_requirements_buildmode_all
     # Check if the specified bootmodes are supported
     if (( ${#bootmodes[@]} < 1 )); then
         (( validation_error=validation_error+1 ))
@@ -822,22 +838,6 @@ _validate_common_requirements_buildmode_iso_netboot() {
         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
-            "_validate_requirements_airootfs_image_type_${airootfs_image_type}"
-        else
-            _msg_warning "Function '_validate_requirements_airootfs_image_type_${airootfs_image_type}' does not exist. Validating the requirements of '${airootfs_image_type}' airootfs image type will not be possible."
-        fi
-    else
-        (( validation_error=validation_error+1 ))
-        _msg_error "Unsupported image type: '${airootfs_image_type}'" 0
-    fi
-}
-
-_validate_requirements_buildmode_iso() {
-    _validate_common_requirements_buildmode_iso_netboot
-    _validate_common_requirements_buildmode_all
     if ! command -v awk &> /dev/null; then
         (( validation_error=validation_error+1 ))
         _msg_error "Validating build mode '${_buildmode}': awk is not available on this host. Install 'awk'!" 0
@@ -1227,7 +1227,11 @@ _build_iso_base() {
     _run_once _make_version
     _run_once _make_customize_airootfs
     _run_once _make_pkglist
-    _make_bootmodes
+    if [[ "${buildmode}" == 'netboot' ]]; then
+        _run_once _make_boot_on_iso9660
+    else
+        _make_bootmodes
+    fi
     _run_once _cleanup_pacstrap_dir
     _run_once _prepare_airootfs_image
 }
-- 
cgit v1.2.3-70-g09d2


From d2addb25c94e10341362e38af89ca3afd6144409 Mon Sep 17 00:00:00 2001
From: nl6720 <nl6720@gmail.com>
Date: Sun, 15 Aug 2021 12:17:12 +0300
Subject: mkarchiso: silence mkfs.fat in quiet mode

mkfs.fat does not have a -q/--quiet option, so redirect its stdout to /dev/null instead.
See https://github.com/dosfstools/dosfstools/issues/103 .

Related to #148.
---
 archiso/mkarchiso | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

(limited to 'archiso/mkarchiso')

diff --git a/archiso/mkarchiso b/archiso/mkarchiso
index 34c3e24..bb0549a 100755
--- a/archiso/mkarchiso
+++ b/archiso/mkarchiso
@@ -505,7 +505,13 @@ _make_efibootimg() {
     # https://lists.gnu.org/archive/html/grub-devel/2019-04/msg00099.html
     rm -f -- "${work_dir}/efiboot.img"
     _msg_info "Creating FAT image of size: ${imgsize} KiB..."
-    mkfs.fat -C -n ARCHISO_EFI "${work_dir}/efiboot.img" "${imgsize}"
+    if [[ "${quiet}" == "y" ]]; then
+        # mkfs.fat does not have a -q/--quiet option, so redirect stdout to /dev/null instead
+        # https://github.com/dosfstools/dosfstools/issues/103
+        mkfs.fat -C -n ARCHISO_EFI "${work_dir}/efiboot.img" "${imgsize}" > /dev/null
+    else
+        mkfs.fat -C -n ARCHISO_EFI "${work_dir}/efiboot.img" "${imgsize}"
+    fi
 
     # Create the default/fallback boot path in which a boot loaders will be placed later.
     mmd -i "${work_dir}/efiboot.img" ::/EFI ::/EFI/BOOT
-- 
cgit v1.2.3-70-g09d2


From ad6d65ab875c9a1ea6edea9e6b1ba99be4932cae Mon Sep 17 00:00:00 2001
From: nl6720 <nl6720@gmail.com>
Date: Thu, 16 Sep 2021 10:40:21 +0300
Subject: mkarchiso: silence xorriso's note about SOURCE_DATE_EPOCH

The `xorriso -as mkisofs` option `-quiet` is interpreted too late. Use native xorriso option `-report_about SORRY` instead and ensure it is the first option.

Related to #148.
---
 archiso/mkarchiso | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

(limited to 'archiso/mkarchiso')

diff --git a/archiso/mkarchiso b/archiso/mkarchiso
index bb0549a..eb30e04 100755
--- a/archiso/mkarchiso
+++ b/archiso/mkarchiso
@@ -995,12 +995,17 @@ _build_bootstrap_image() {
 
 # Build ISO
 _build_iso_image() {
-    local xorrisofs_options=()
+    local xorriso_options=() xorrisofs_options=()
     local bootmode
 
     [[ -d "${out_dir}" ]] || install -d -- "${out_dir}"
 
-    [[ "${quiet}" == "y" ]] && xorrisofs_options+=('-quiet')
+    if [[ "${quiet}" == "y" ]]; then
+        # The when xorriso is run in mkisofs compatibility mode (xorrisofs), the mkisofs option -quiet is interpreted
+        # too late (e.g. messages about SOURCE_DATE_EPOCH still get shown).
+        # Instead use native xorriso option to silence the output.
+        xorriso_options=('-report_about' 'SORRY' "${xorriso_options[@]}")
+    fi
 
     # Add required xorrisofs options for each boot mode
     for bootmode in "${bootmodes[@]}"; do
@@ -1009,7 +1014,7 @@ _build_iso_image() {
 
     rm -f -- "${out_dir}/${image_name}"
     _msg_info "Creating ISO image..."
-    xorriso -as mkisofs \
+    xorriso "${xorriso_options[@]}" -as mkisofs \
             -iso-level 3 \
             -full-iso9660-filenames \
             -joliet \
-- 
cgit v1.2.3-70-g09d2


From 5738f40aa94c97dc5393703900a20ae2f79b2045 Mon Sep 17 00:00:00 2001
From: nl6720 <nl6720@gmail.com>
Date: Thu, 16 Sep 2021 10:50:02 +0300
Subject: mkarchiso: redirect command -v output to /dev/null

The output is irrelevant, we only need the return code.

Related to #148.
---
 archiso/mkarchiso | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'archiso/mkarchiso')

diff --git a/archiso/mkarchiso b/archiso/mkarchiso
index eb30e04..38aad06 100755
--- a/archiso/mkarchiso
+++ b/archiso/mkarchiso
@@ -748,7 +748,7 @@ _validate_requirements_airootfs_image_type_ext4+squashfs() {
 }
 
 _validate_requirements_airootfs_image_type_erofs() {
-    if ! command -v mkfs.erofs; then
+    if ! command -v mkfs.erofs &> /dev/null; then
         (( validation_error=validation_error+1 ))
         _msg_error "Validating '${airootfs_image_type}': mkfs.erofs is not available on this host. Install 'erofs-utils'!" 0
     fi
-- 
cgit v1.2.3-70-g09d2


From 009140bd8bb497df148c3b468f0e1b217371d62c Mon Sep 17 00:00:00 2001
From: nl6720 <nl6720@gmail.com>
Date: Thu, 16 Sep 2021 11:11:34 +0300
Subject: mkarchiso: do not show subdirectory sizes in netboot mode

Only the total size is relevant.

Related to #148.
---
 archiso/mkarchiso | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'archiso/mkarchiso')

diff --git a/archiso/mkarchiso b/archiso/mkarchiso
index 38aad06..b7fe91c 100755
--- a/archiso/mkarchiso
+++ b/archiso/mkarchiso
@@ -704,7 +704,7 @@ _export_netboot_artifacts() {
     install -d -m 0755 "${out_dir}"
     cp -a -- "${isofs_dir}/${install_dir}/" "${out_dir}/"
     _msg_info "Done!"
-    du -h -- "${out_dir}/${install_dir}"
+    du -hs -- "${out_dir}/${install_dir}"
 }
 
 # sign build artifacts for netboot
-- 
cgit v1.2.3-70-g09d2


From 8cfe29043f0626e12e157cd3f2354a6baf3ba076 Mon Sep 17 00:00:00 2001
From: nl6720 <nl6720@gmail.com>
Date: Fri, 5 Nov 2021 12:46:54 +0200
Subject: mkarchiso: use mksquashfs -quiet instead of redirecting its stdout to
 /dev/null

mksquashfs supports a -quiet option since squashfs-tools 4.4.
Use this option in non-verbose mode instead of redirecting stdout of the whole command to /dev/null.

This allows to have only one instance of mksquashfs in _run_mksquashfs instead of multiple ones in if-then-else.

Related to #148.
---
 archiso/mkarchiso | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

(limited to 'archiso/mkarchiso')

diff --git a/archiso/mkarchiso b/archiso/mkarchiso
index b7fe91c..8332604 100755
--- a/archiso/mkarchiso
+++ b/archiso/mkarchiso
@@ -165,13 +165,10 @@ _cleanup_pacstrap_dir() {
 # Create a squashfs image and place it in the ISO 9660 file system.
 # $@: options to pass to mksquashfs
 _run_mksquashfs() {
-    local image_path="${isofs_dir}/${install_dir}/${arch}/airootfs.sfs"
+    local mksquashfs_options=() image_path="${isofs_dir}/${install_dir}/${arch}/airootfs.sfs"
     rm -f -- "${image_path}"
-    if [[ "${quiet}" == "y" ]]; then
-        mksquashfs "$@" "${image_path}" -noappend "${airootfs_image_tool_options[@]}" -no-progress > /dev/null
-    else
-        mksquashfs "$@" "${image_path}" -noappend "${airootfs_image_tool_options[@]}"
-    fi
+    [[ ! "${quiet}" == "y" ]] || mksquashfs_options+=('-no-progress' '-quiet')
+    mksquashfs "$@" "${image_path}" -noappend "${airootfs_image_tool_options[@]}" "${mksquashfs_options[@]}"
 }
 
 # Create an ext4 image containing the root file system and pack it inside a squashfs image.
-- 
cgit v1.2.3-70-g09d2


From a7f879fcdd5986ad6047a4a59d61ef10b7d9f05e Mon Sep 17 00:00:00 2001
From: nl6720 <nl6720@gmail.com>
Date: Mon, 22 Nov 2021 11:40:59 +0200
Subject: mkarchiso: use mkfs.erofs --quiet in quiet mode

erofs-utils 1.4 introduced a --quiet option.

Related to #148.
---
 archiso/mkarchiso | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

(limited to 'archiso/mkarchiso')

diff --git a/archiso/mkarchiso b/archiso/mkarchiso
index 8332604..4d7b1bc 100755
--- a/archiso/mkarchiso
+++ b/archiso/mkarchiso
@@ -213,16 +213,18 @@ _mkairootfs_squashfs() {
 
 # Create an EROFS image containing the root file system and saves it on the ISO 9660 file system.
 _mkairootfs_erofs() {
-    local fsuuid
+    local fsuuid mkfs_erofs_options=()
     [[ -e "${pacstrap_dir}" ]] || _msg_error "The path '${pacstrap_dir}' does not exist" 1
 
     install -d -m 0755 -- "${isofs_dir}/${install_dir}/${arch}"
     local image_path="${isofs_dir}/${install_dir}/${arch}/airootfs.erofs"
     rm -f -- "${image_path}"
+    [[ ! "${quiet}" == "y" ]] || mkfs_erofs_options+=('--quiet')
     # Generate reproducible file system UUID from SOURCE_DATE_EPOCH
     fsuuid="$(uuidgen --sha1 --namespace 93a870ff-8565-4cf3-a67b-f47299271a96 --name "${SOURCE_DATE_EPOCH}")"
+    mkfs_erofs_options+=('-U' "${fsuuid}" "${airootfs_image_tool_options[@]}")
     _msg_info "Creating EROFS image, this may take some time..."
-    mkfs.erofs -U "${fsuuid}" "${airootfs_image_tool_options[@]}" -- "${image_path}" "${pacstrap_dir}"
+    mkfs.erofs "${mkfs_erofs_options[@]}" -- "${image_path}" "${pacstrap_dir}"
     _msg_info "Done!"
 }
 
-- 
cgit v1.2.3-70-g09d2


From dae5494ca12dbf7bb1bafcd11eee5be32a734d6d Mon Sep 17 00:00:00 2001
From: nl6720 <nl6720@gmail.com>
Date: Fri, 10 Dec 2021 13:14:15 +0200
Subject: mkarchiso: show "Code signing certificates: None" if no
 keys/certificates are specified

Fixes #151.
---
 archiso/mkarchiso | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'archiso/mkarchiso')

diff --git a/archiso/mkarchiso b/archiso/mkarchiso
index 4d7b1bc..ddb7022 100755
--- a/archiso/mkarchiso
+++ b/archiso/mkarchiso
@@ -125,7 +125,7 @@ _show_config() {
     _msg_info "              Build modes:   ${buildmodes[*]}"
     _msg_info "                  GPG key:   ${gpg_key:-None}"
     _msg_info "               GPG signer:   ${gpg_sender:-None}"
-    _msg_info "Code signing certificates:   ${cert_list[*]}"
+    _msg_info "Code signing certificates:   ${cert_list[*]:-None}"
     _msg_info "                  Profile:   ${profile}"
     _msg_info "Pacman configuration file:   ${pacman_conf}"
     _msg_info "          Image file name:   ${image_name:-None}"
-- 
cgit v1.2.3-70-g09d2


From 025d6b828fd109df5a58517cc6bd5cb2f8c059d6 Mon Sep 17 00:00:00 2001
From: hayao <hayao@fascode.net>
Date: Sat, 8 Jan 2022 01:39:31 +0900
Subject: mkarchiso: Fix mmd-command check

valication_error variable is not changed when mmd and/or mcopy are missing.
---
 archiso/mkarchiso | 1 +
 1 file changed, 1 insertion(+)

(limited to 'archiso/mkarchiso')

diff --git a/archiso/mkarchiso b/archiso/mkarchiso
index ddb7022..dab6bde 100755
--- a/archiso/mkarchiso
+++ b/archiso/mkarchiso
@@ -653,6 +653,7 @@ _validate_requirements_bootmode_uefi-x64.systemd-boot.esp() {
 
     # Check if mmd and mcopy are available
     if ! { command -v mmd &> /dev/null && command -v mcopy &> /dev/null; }; then
+        (( validation_error=validation_error+1 ))
         _msg_error "Validating '${bootmode}': mmd and/or mcopy are not available on this host. Install 'mtools'!" 0
     fi
 
-- 
cgit v1.2.3-70-g09d2


From 742619240c9f534123e8205eef8dca1a20c7d439 Mon Sep 17 00:00:00 2001
From: weltio weltio <weltio@web.de>
Date: Fri, 21 Jan 2022 09:49:49 +0000
Subject: https://gitlab.archlinux.org/archlinux/archiso/-/issues/163

---
 archiso/mkarchiso | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'archiso/mkarchiso')

diff --git a/archiso/mkarchiso b/archiso/mkarchiso
index dab6bde..f6b3395 100755
--- a/archiso/mkarchiso
+++ b/archiso/mkarchiso
@@ -1048,6 +1048,7 @@ _read_profile() {
         . "${profile}/profiledef.sh"
 
         # Resolve paths of files that are expected to reside in the profile's directory
+        [[ -n "$arch" ]] || arch="$(uname -m)"
         [[ -n "$packages" ]] || packages="${profile}/packages.${arch}"
         packages="$(realpath -- "${packages}")"
         pacman_conf="$(realpath -- "${pacman_conf}")"
@@ -1155,7 +1156,6 @@ _set_overrides() {
     fi
 
     # Set variables that do not have overrides
-    [[ -n "$arch" ]] || arch="$(uname -m)"
     [[ -n "$airootfs_image_type" ]] || airootfs_image_type="squashfs"
     [[ -n "$iso_name" ]] || iso_name="${app_name}"
 }
-- 
cgit v1.2.3-70-g09d2