From 65d058e1b86f5cbfb7cd803628461dfbf1f9dea0 Mon Sep 17 00:00:00 2001 From: zj <1052308357@qq.com> Date: Mon, 29 Dec 2025 17:49:04 +0800 Subject: [PATCH] remove efiboot ,use grub --- archiso/airootfs/boot/grub/background.png | Bin 0 -> 26833 bytes .../loader/entries/01-archiso-x86_64-linux.conf | 5 ----- .../entries/02-archiso-x86_64-speech-linux.conf | 7 ------- .../entries/03-archiso-x86_64-memtest86+.conf | 3 --- archiso/efiboot/loader/loader.conf | 3 --- archiso/grub/grub.cfg | 3 ++- archiso/profiledef.sh | 8 +++----- 7 files changed, 5 insertions(+), 24 deletions(-) create mode 100644 archiso/airootfs/boot/grub/background.png delete mode 100755 archiso/efiboot/loader/entries/01-archiso-x86_64-linux.conf delete mode 100755 archiso/efiboot/loader/entries/02-archiso-x86_64-speech-linux.conf delete mode 100755 archiso/efiboot/loader/entries/03-archiso-x86_64-memtest86+.conf delete mode 100755 archiso/efiboot/loader/loader.conf diff --git a/archiso/airootfs/boot/grub/background.png b/archiso/airootfs/boot/grub/background.png new file mode 100644 index 0000000000000000000000000000000000000000..47e33fc1bf4f15c9b7dca1d339e6472fbb47f5f3 GIT binary patch literal 26833 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 Th+9k+F@ literal 0 HcmV?d00001 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"