diff --git a/archiso/airootfs/boot/grub/background.png b/archiso/airootfs/boot/grub/background.png new file mode 100644 index 0000000..47e33fc Binary files /dev/null and b/archiso/airootfs/boot/grub/background.png differ diff --git a/archiso/efiboot/loader/entries/01-archiso-x86_64-linux.conf b/archiso/efiboot/loader/entries/01-archiso-x86_64-linux.conf deleted file mode 100755 index 8f8fa5a..0000000 --- a/archiso/efiboot/loader/entries/01-archiso-x86_64-linux.conf +++ /dev/null @@ -1,5 +0,0 @@ -title BBTTMS Linux install medium (x86_64, UEFI) -sort-key 01 -linux /%INSTALL_DIR%/boot/x86_64/vmlinuz-linux -initrd /%INSTALL_DIR%/boot/x86_64/initramfs-linux.img -options archisobasedir=%INSTALL_DIR% archisosearchuuid=%ARCHISO_UUID% cow_spacesize=4G copytoram=n diff --git a/archiso/efiboot/loader/entries/02-archiso-x86_64-speech-linux.conf b/archiso/efiboot/loader/entries/02-archiso-x86_64-speech-linux.conf deleted file mode 100755 index c42fab0..0000000 --- a/archiso/efiboot/loader/entries/02-archiso-x86_64-speech-linux.conf +++ /dev/null @@ -1,7 +0,0 @@ -title BBTTMS Linux install medium (x86_64, UEFI) with speech -sort-key 02 -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% archisosearchuuid=%ARCHISO_UUID% accessibility=on cow_spacesize=4G copytoram=n diff --git a/archiso/efiboot/loader/entries/03-archiso-x86_64-memtest86+.conf b/archiso/efiboot/loader/entries/03-archiso-x86_64-memtest86+.conf deleted file mode 100755 index d0b305c..0000000 --- a/archiso/efiboot/loader/entries/03-archiso-x86_64-memtest86+.conf +++ /dev/null @@ -1,3 +0,0 @@ -title Memtest86+ -sort-key 03 -efi /boot/memtest86+/memtest.efi diff --git a/archiso/efiboot/loader/loader.conf b/archiso/efiboot/loader/loader.conf deleted file mode 100755 index 2d137aa..0000000 --- a/archiso/efiboot/loader/loader.conf +++ /dev/null @@ -1,3 +0,0 @@ -timeout 15 -default 01-archiso-x86_64-linux.conf -beep on diff --git a/archiso/grub/grub.cfg b/archiso/grub/grub.cfg index 799f9e9..5b8b8bd 100755 --- a/archiso/grub/grub.cfg +++ b/archiso/grub/grub.cfg @@ -14,6 +14,7 @@ if loadfont "${prefix}/fonts/unicode.pf2" ; then set gfxmode="auto" terminal_input console terminal_output console + set background_image="/boot/grub/background.png fi # Enable serial console @@ -44,7 +45,7 @@ else fi # Set default menu entry -default=alci +default=BBTTMS timeout=15 timeout_style=menu diff --git a/archiso/profiledef.sh b/archiso/profiledef.sh index 71ed5ee..4e276f0 100755 --- a/archiso/profiledef.sh +++ b/archiso/profiledef.sh @@ -2,15 +2,13 @@ # shellcheck disable=SC2034 iso_name="BBTTMS" -iso_label="BBTTMS_$(date --date="@${SOURCE_DATE_EPOCH:-$(date +%s)}" +%Y%m)" +iso_label="BBTTMS-$(date --date="@${SOURCE_DATE_EPOCH:-$(date +%s)}" +%Y%m)" iso_publisher="BBTTMS " iso_application="BBTTMS Arch Linux Live/Rescue/Install DVD" -iso_version="TMS_PKG_$(date --date="@${SOURCE_DATE_EPOCH:-$(date +%s)}" +%Y.%m.%d)" +iso_version="$(date --date="@${SOURCE_DATE_EPOCH:-$(date +%s)}" +%Y.%m.%d)" install_dir="BBTTMS" 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') +bootmodes=('bios.syslinux' 'uefi.grub') arch="x86_64" pacman_conf="pacman.conf" airootfs_image_type="squashfs"