diff --git a/configs/releng/build.sh b/configs/releng/build.sh index 66e03be..3ef4085 100755 --- a/configs/releng/build.sh +++ b/configs/releng/build.sh @@ -130,7 +130,8 @@ make_syslinux() { 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##*/} + s|%INSTALL_DIR%|${install_dir}|g; + s|%ISO_VERSION%|${iso_version}|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 @@ -164,7 +165,8 @@ make_efi() { cp ${script_path}/efiboot/loader/entries/uefi-shell-v1-x86_64.conf ${work_dir}/iso/loader/entries/ sed "s|%ARCHISO_LABEL%|${iso_label}|g; - s|%INSTALL_DIR%|${install_dir}|g" \ + s|%INSTALL_DIR%|${install_dir}|g; + s|%ISO_VERSION%|${iso_version}|g" \ ${script_path}/efiboot/loader/entries/archiso-x86_64-usb.conf > ${work_dir}/iso/loader/entries/archiso-x86_64.conf # EFI Shell 2.0 for UEFI 2.3+ @@ -178,7 +180,8 @@ make_efi_syslinux() { mkdir -p ${work_dir}/iso/EFI/syslinux for _cfg in ${script_path}/syslinux_efi64/*.cfg; do sed "s|%ARCHISO_LABEL%|${iso_label}|g; - s|%INSTALL_DIR%|${install_dir}|g" ${_cfg} > ${work_dir}/iso/EFI/syslinux/${_cfg##*/} + s|%INSTALL_DIR%|${install_dir}|g; + s|%ISO_VERSION%|${iso_version}|g" ${_cfg} > ${work_dir}/iso/EFI/syslinux/${_cfg##*/} done cp ${script_path}/syslinux_efi64/splash.png ${work_dir}/iso/EFI/syslinux cp ${work_dir}/x86_64/airootfs/usr/lib/syslinux/efi64/*.c32 ${work_dir}/iso/EFI/syslinux @@ -214,7 +217,8 @@ make_efiboot() { cp ${script_path}/efiboot/loader/entries/uefi-shell-v1-x86_64.conf ${work_dir}/efiboot/loader/entries/ sed "s|%ARCHISO_LABEL%|${iso_label}|g; - s|%INSTALL_DIR%|${install_dir}|g" \ + s|%INSTALL_DIR%|${install_dir}|g; + s|%ISO_VERSION%|${iso_version}|g" \ ${script_path}/efiboot/loader/entries/archiso-x86_64-cd.conf > ${work_dir}/efiboot/loader/entries/archiso-x86_64.conf cp ${work_dir}/iso/EFI/shellx64_v2.efi ${work_dir}/efiboot/EFI/ 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 b77ed98..5d01b2f 100644 --- a/configs/releng/efiboot/loader/entries/archiso-x86_64-cd.conf +++ b/configs/releng/efiboot/loader/entries/archiso-x86_64-cd.conf @@ -1,4 +1,4 @@ -title Arch Linux archiso x86_64 UEFI CD +title Arch Linux %ISO_VERSION% x86_64 UEFI CD linux /EFI/archiso/vmlinuz.efi initrd /EFI/archiso/intel_ucode.img initrd /EFI/archiso/amd_ucode.img 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 09adca4..17c01c2 100644 --- a/configs/releng/efiboot/loader/entries/archiso-x86_64-usb.conf +++ b/configs/releng/efiboot/loader/entries/archiso-x86_64-usb.conf @@ -1,4 +1,4 @@ -title Arch Linux archiso x86_64 UEFI USB +title Arch Linux %ISO_VERSION% x86_64 UEFI USB linux /%INSTALL_DIR%/boot/x86_64/vmlinuz initrd /%INSTALL_DIR%/boot/intel_ucode.img initrd /%INSTALL_DIR%/boot/amd_ucode.img diff --git a/configs/releng/syslinux/archiso_head.cfg b/configs/releng/syslinux/archiso_head.cfg index ffe2128..851d82f 100644 --- a/configs/releng/syslinux/archiso_head.cfg +++ b/configs/releng/syslinux/archiso_head.cfg @@ -1,6 +1,6 @@ SERIAL 0 38400 UI vesamenu.c32 -MENU TITLE Arch Linux +MENU TITLE Arch Linux %ISO_VERSION% (Legacy boot) MENU BACKGROUND splash.png MENU WIDTH 78 diff --git a/configs/releng/syslinux_efi64/archiso_head.cfg b/configs/releng/syslinux_efi64/archiso_head.cfg index ffe2128..a9b6c44 100644 --- a/configs/releng/syslinux_efi64/archiso_head.cfg +++ b/configs/releng/syslinux_efi64/archiso_head.cfg @@ -1,6 +1,6 @@ SERIAL 0 38400 UI vesamenu.c32 -MENU TITLE Arch Linux +MENU TITLE Arch Linux %ISO_VERSION% (UEFI boot) MENU BACKGROUND splash.png MENU WIDTH 78