From d9329d8f0c7f1386f6a87313d70911393f8f0ae8 Mon Sep 17 00:00:00 2001
From: Thomas Brugman <thomas.brugman.teb3@gmail.com>
Date: Sun, 19 Oct 2025 15:52:02 +0200
Subject: [PATCH 1/3] build: Update Dockerfile and package list for additional
 dependencies

---
 dockerfile      | 5 +++++
 packages.x86_64 | 6 +++---
 profiledef.sh   | 3 +--
 3 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/dockerfile b/dockerfile
index 73ff93777..1a92fe00f 100644
--- a/dockerfile
+++ b/dockerfile
@@ -9,6 +9,11 @@ RUN pacman -Syu --noconfirm && \
     git \
     archiso \
     grub \
+    syslinux \
+    systemd \
+    efibootmgr \
+    dosfstools \
+    mtools \
     base-devel \
     && pacman -Scc --noconfirm
 
diff --git a/packages.x86_64 b/packages.x86_64
index 1e9a752e1..db9af4a31 100644
--- a/packages.x86_64
+++ b/packages.x86_64
@@ -1,7 +1,7 @@
 alsa-utils
 amd-ucode
-arch-install-scripts
 archinstall
+arch-install-scripts
 b43-fwcutter
 base
 bcachefs-tools
@@ -77,11 +77,11 @@ nilfs-utils
 nmap
 ntfs-3g
 nvme-cli
-open-iscsi
-open-vm-tools
 openconnect
+open-iscsi
 openpgp-card-tools
 openssh
+open-vm-tools
 openvpn
 partclone
 parted
diff --git a/profiledef.sh b/profiledef.sh
index 7120c45dc..e945aa3e3 100755
--- a/profiledef.sh
+++ b/profiledef.sh
@@ -9,8 +9,7 @@ iso_version="$(date --date="@${SOURCE_DATE_EPOCH:-$(date +%s)}" +%Y.%m.%d)"
 install_dir="arch"
 buildmodes=('iso')
 bootmodes=('bios.syslinux.mbr' 'bios.syslinux.eltorito'
-           'uefi-ia32.systemd-boot.esp' 'uefi-x64.systemd-boot.esp'
-           'uefi-ia32.systemd-boot.eltorito' 'uefi-x64.systemd-boot.eltorito')
+           'uefi-x64.systemd-boot.esp' 'uefi-x64.systemd-boot.eltorito')
 arch="x86_64"
 pacman_conf="pacman.conf"
 airootfs_image_type="squashfs"

From caafd671d2de35589f4460162dbfc59134d5d403 Mon Sep 17 00:00:00 2001
From: Thomas Brugman <thomas.brugman.teb3@gmail.com>
Date: Sun, 19 Oct 2025 16:00:19 +0200
Subject: [PATCH 2/3] build: Add arch-install-scripts and bash to Dockerfile
 dependencies; refine bootmodes in profiledef.sh; enhance entrypoint.sh to
 verify mkarchiso installation

---
 dockerfile            | 2 ++
 profiledef.sh         | 3 +--
 scripts/entrypoint.sh | 8 ++++++++
 3 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/dockerfile b/dockerfile
index 1a92fe00f..1416553b1 100644
--- a/dockerfile
+++ b/dockerfile
@@ -14,6 +14,8 @@ RUN pacman -Syu --noconfirm && \
     efibootmgr \
     dosfstools \
     mtools \
+    arch-install-scripts \
+    bash \
     base-devel \
     && pacman -Scc --noconfirm
 
diff --git a/profiledef.sh b/profiledef.sh
index e945aa3e3..9fb4ac88e 100755
--- a/profiledef.sh
+++ b/profiledef.sh
@@ -8,8 +8,7 @@ iso_application="Arch Linux No Beep Live/Rescue DVD"
 iso_version="$(date --date="@${SOURCE_DATE_EPOCH:-$(date +%s)}" +%Y.%m.%d)"
 install_dir="arch"
 buildmodes=('iso')
-bootmodes=('bios.syslinux.mbr' 'bios.syslinux.eltorito'
-           'uefi-x64.systemd-boot.esp' 'uefi-x64.systemd-boot.eltorito')
+bootmodes=('bios.syslinux.mbr' 'uefi-x64.systemd-boot.esp')
 arch="x86_64"
 pacman_conf="pacman.conf"
 airootfs_image_type="squashfs"
diff --git a/scripts/entrypoint.sh b/scripts/entrypoint.sh
index 26f5058da..2336872f1 100755
--- a/scripts/entrypoint.sh
+++ b/scripts/entrypoint.sh
@@ -99,6 +99,14 @@ EOF
     # Note: We don't modify profiledef.sh anymore as -Xthreads is not supported by mksquashfs
     # The profiledef.sh file already has proper XZ compression settings
     
+    # Verify mkarchiso is available and check its version
+    log "Verifying mkarchiso installation..."
+    if ! command -v mkarchiso &> /dev/null; then
+        error "mkarchiso command not found. Please ensure archiso package is properly installed."
+    fi
+    
+    log "mkarchiso version: $(mkarchiso --version 2>/dev/null || echo 'unknown')"
+    
     # Run mkarchiso with verbose option and handle errors
     log "Building Arch ISO with mkarchiso..."
     if mkarchiso -v -w "$work_dir" -o "$output_dir" .; then

From 2f8457880bb3253e946c9a4f0c336ab401f7074f Mon Sep 17 00:00:00 2001
From: Thomas Brugman <thomas.brugman.teb3@gmail.com>
Date: Sun, 19 Oct 2025 16:08:16 +0200
Subject: [PATCH 3/3] Revert "build: Update Dockerfile and package list for
 additional dependencies"

This reverts commit d9329d8f0c7f1386f6a87313d70911393f8f0ae8.
---
 dockerfile      | 7 -------
 packages.x86_64 | 6 +++---
 profiledef.sh   | 4 +++-
 3 files changed, 6 insertions(+), 11 deletions(-)

diff --git a/dockerfile b/dockerfile
index 1416553b1..73ff93777 100644
--- a/dockerfile
+++ b/dockerfile
@@ -9,13 +9,6 @@ RUN pacman -Syu --noconfirm && \
     git \
     archiso \
     grub \
-    syslinux \
-    systemd \
-    efibootmgr \
-    dosfstools \
-    mtools \
-    arch-install-scripts \
-    bash \
     base-devel \
     && pacman -Scc --noconfirm
 
diff --git a/packages.x86_64 b/packages.x86_64
index db9af4a31..1e9a752e1 100644
--- a/packages.x86_64
+++ b/packages.x86_64
@@ -1,7 +1,7 @@
 alsa-utils
 amd-ucode
-archinstall
 arch-install-scripts
+archinstall
 b43-fwcutter
 base
 bcachefs-tools
@@ -77,11 +77,11 @@ nilfs-utils
 nmap
 ntfs-3g
 nvme-cli
-openconnect
 open-iscsi
+open-vm-tools
+openconnect
 openpgp-card-tools
 openssh
-open-vm-tools
 openvpn
 partclone
 parted
diff --git a/profiledef.sh b/profiledef.sh
index 9fb4ac88e..7120c45dc 100755
--- a/profiledef.sh
+++ b/profiledef.sh
@@ -8,7 +8,9 @@ iso_application="Arch Linux No Beep Live/Rescue DVD"
 iso_version="$(date --date="@${SOURCE_DATE_EPOCH:-$(date +%s)}" +%Y.%m.%d)"
 install_dir="arch"
 buildmodes=('iso')
-bootmodes=('bios.syslinux.mbr' 'uefi-x64.systemd-boot.esp')
+bootmodes=('bios.syslinux.mbr' 'bios.syslinux.eltorito'
+           'uefi-ia32.systemd-boot.esp' 'uefi-x64.systemd-boot.esp'
+           'uefi-ia32.systemd-boot.eltorito' 'uefi-x64.systemd-boot.eltorito')
 arch="x86_64"
 pacman_conf="pacman.conf"
 airootfs_image_type="squashfs"