Skip to content

Commit caafd67

Browse files
build: Add arch-install-scripts and bash to Dockerfile dependencies; refine bootmodes in profiledef.sh; enhance entrypoint.sh to verify mkarchiso installation
1 parent d9329d8 commit caafd67

File tree

3 files changed

+11
-2
lines changed

3 files changed

+11
-2
lines changed

dockerfile

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,8 @@ RUN pacman -Syu --noconfirm && \
1414
efibootmgr \
1515
dosfstools \
1616
mtools \
17+
arch-install-scripts \
18+
bash \
1719
base-devel \
1820
&& pacman -Scc --noconfirm
1921

profiledef.sh

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,7 @@ iso_application="Arch Linux No Beep Live/Rescue DVD"
88
iso_version="$(date --date="@${SOURCE_DATE_EPOCH:-$(date +%s)}" +%Y.%m.%d)"
99
install_dir="arch"
1010
buildmodes=('iso')
11-
bootmodes=('bios.syslinux.mbr' 'bios.syslinux.eltorito'
12-
'uefi-x64.systemd-boot.esp' 'uefi-x64.systemd-boot.eltorito')
11+
bootmodes=('bios.syslinux.mbr' 'uefi-x64.systemd-boot.esp')
1312
arch="x86_64"
1413
pacman_conf="pacman.conf"
1514
airootfs_image_type="squashfs"

scripts/entrypoint.sh

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -99,6 +99,14 @@ EOF
9999
# Note: We don't modify profiledef.sh anymore as -Xthreads is not supported by mksquashfs
100100
# The profiledef.sh file already has proper XZ compression settings
101101

102+
# Verify mkarchiso is available and check its version
103+
log "Verifying mkarchiso installation..."
104+
if ! command -v mkarchiso &> /dev/null; then
105+
error "mkarchiso command not found. Please ensure archiso package is properly installed."
106+
fi
107+
108+
log "mkarchiso version: $(mkarchiso --version 2>/dev/null || echo 'unknown')"
109+
102110
# Run mkarchiso with verbose option and handle errors
103111
log "Building Arch ISO with mkarchiso..."
104112
if mkarchiso -v -w "$work_dir" -o "$output_dir" .; then

0 commit comments

Comments
 (0)