root/archboot
1
0
Fork 0
mirror of https://gitlab.archlinux.org/tpowa/archboot.git synced 2024-09-20 03:50:37 +02:00
Code Issues Projects Releases Packages Wiki Activity

Revert "add EFISTUB boot option to GRUB"

Browse source 
This reverts commit f2c73ac37b.
This commit is contained in:
Tobias Powalowski 2022-05-15 20:57:59 +02:00
parent 6c91c1870e
commit 029727e708
8 changed files with 3 additions and 38 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
usr/lib/archboot/iso.sh
View file

@ -138,6 +138,7 @@ _prepare_background() {
cp ${_GRUB_BACKGROUND} "${_ISODIR}/boot/grub/archboot-background.png"
}
<<<<<<< HEAD
_prepare_systemd-boot_X64() {
echo "Prepare X64 systemd-boot ..."
[[ -d ${_ISODIR}/boot/systemd-boot ]] || mkdir -p ${_ISODIR}/boot/systemd-boot
@ -175,6 +176,8 @@ _prepare_systemd-boot_entry() {
}
=======
>>>>>>> parent of f2c73ac3 (add EFISTUB boot option to GRUB)
_reproducibility() {
# Reproducibility: set all timestamps to 0
# from /usr/bin/mkinitcpio

10
usr/share/archboot/grub/archboot-main-grub.cfg
View file

@ -100,11 +100,6 @@ if [ ${grub_platform} == "efi" ]; then
_initrd_x86_64
}
menuentry "Arch Linux x86_64 Archboot - EFISTUB" {
_menu_running
chainloader /boot/systemd-boot/systemd-bootx64.efi
}
submenu "UEFI Tools" {
_secure_boot_tools
_efi_shell
@ -119,11 +114,6 @@ if [ ${grub_platform} == "efi" ]; then
_initrd_aarch64
}
menuentry "Arch Linux AA64 Archboot - EFISTUB" {
_menu_running
chainloader /boot/systemd-boot/systemd-bootaa64.efi
}
submenu "UEFI Tools" {
_secure_boot_tools
}

6
usr/share/archboot/systemd-boot/boot/loader/entries/archboot-aa64-local.conf
View file

@ -1,6 +0,0 @@
title Arch Linux AA64 Archboot - EFISTUB
linux /vmlinuz_aarch64
initrd /amd-ucode.img
initrd /initramfs_aarch64-0.img
initrd /initramfs_aarch64-1.img
options rootfstype=ramfs nr_cpus=1 console=ttyAMA0,115200 console=tty0 loglevel=4

5
usr/share/archboot/systemd-boot/boot/loader/entries/archboot-aa64.conf
View file

@ -1,5 +0,0 @@
title Arch Linux AA64 Archboot - EFISTUB
linux /vmlinuz_aarch64
initrd /amd-ucode.img
initrd /initramfs_aarch64.img
options rootfstype=ramfs nr_cpus=1 console=ttyAMA0,115200 console=tty0 loglevel=4

7
usr/share/archboot/systemd-boot/boot/loader/entries/archboot-x64-local.conf
View file

@ -1,7 +0,0 @@
title Arch Linux x86_64 Archboot - EFISTUB
linux /vmlinuz_x86_64
initrd /amd-ucode.img
initrd /intel-ucode.img
initrd /initramfs_x86_64-0.img
initrd /initramfs_x86_64-1.img
options rootfstype=ramfs console=ttyS0,115200 console=tty0

6
usr/share/archboot/systemd-boot/boot/loader/entries/archboot-x64.conf
View file

@ -1,6 +0,0 @@
title Arch Linux x86_64 Archboot - EFISTUB
linux /vmlinuz_x86_64
initrd /amd-ucode.img
initrd /intel-ucode.img
initrd /initramfs_x86_64.img
options rootfstype=ramfs console=ttyS0,115200 console=tty0

2
usr/share/archboot/systemd-boot/boot/loader/loader-aa64.conf
View file

@ -1,2 +0,0 @@
timeout 10
default archboot-aa64

2
usr/share/archboot/systemd-boot/boot/loader/loader-x64.conf
View file

@ -1,2 +0,0 @@
timeout 10
default archboot-x64