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

fix uefi shells

Browse source
This commit is contained in:
Tobias Powalowski 2022-12-09 11:35:46 +01:00
parent 32a82b0112
commit a98c83ace3
2 changed files with 7 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -135,14 +135,10 @@ _prepare_efitools_uefi () {
_prepare_uefi_shell_tianocore() { _prepare_uefi_shell_tianocore() {
echo "Prepare uefi shells ..." echo "Prepare uefi shells ..."
## Install Tianocore UDK/EDK2 ShellBinPkg UEFI X64 "Full Shell" - For UEFI Spec. >=2.3 systems
cp /usr/share/edk2-shell/x64/Shell.efi "${_ISODIR}/EFI/TOOLS/SHELLX64_V2.EFI"
## Install Tianocore UDK/EDK2 EdkShellBinPkg UEFI X64 "Full Shell" - For UEFI Spec. <2.3 systems ## Install Tianocore UDK/EDK2 EdkShellBinPkg UEFI X64 "Full Shell" - For UEFI Spec. <2.3 systems
cp /usr/share/edk2-shell/x64/Shell_Full.efi "${_ISODIR}/EFI/TOOLS/SHELLX64_V1.EFI" cp /usr/share/edk2-shell/x64/Shell_Full.efi "${_ISODIR}/EFI/TOOLS/SHELLX64.EFI"
## Install Tianocore UDK/EDK2 ShellBinPkg UEFI IA32 "Full Shell" - For UEFI Spec. >=2.3 systems ## Install Tianocore UDK/EDK2 ShellBinPkg UEFI IA32 "Full Shell" - For UEFI Spec. >=2.3 systems
cp /usr/share/edk2-shell/ia32/Shell.efi "${_ISODIR}/EFI/TOOLS/SHELLIA32_V2.EFI" cp /usr/share/edk2-shell/ia32/Shell_Full.efi "${_ISODIR}/EFI/TOOLS/SHELLIA32.EFI"
## InstallTianocore UDK/EDK2 EdkShellBinPkg UEFI IA32 "Full Shell" - For UEFI Spec. <2.3 systems
cp /usr/share/edk2-shell/ia32/Shell_Full.efi "${_ISODIR}/EFI/TOOLS/SHELLIA32_V1.EFI"
} }
# build grubXXX with all modules: http://bugs.archlinux.org/task/71382 # build grubXXX with all modules: http://bugs.archlinux.org/task/71382

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

@ -50,14 +50,9 @@ function _efi_shell {
elif [ ${grub_cpu} == "i386" ]; then elif [ ${grub_cpu} == "i386" ]; then
_EXT="IA32" _EXT="IA32"
fi fi
menuentry "UEFI Shell version 2" { menuentry "UEFI Shell" {
_menu_running _menu_running
chainloader /EFI/TOOLS/SHELL${_EXT}_V2.EFI chainloader /EFI/TOOLS/SHELL${_EXT}.EFI
}
menuentry "UEFI Shell version 1" {
_menu_running
chainloader /EFI/TOOLS/SHELL${_EXT}_V1.EFI
} }
} }
@ -104,10 +99,7 @@ if [ ${grub_platform} == "efi" ]; then
linux /boot/vmlinuz_x86_64 rootfstype=ramfs console=ttyS0,115200 console=tty0 linux /boot/vmlinuz_x86_64 rootfstype=ramfs console=ttyS0,115200 console=tty0
_initrd_x86_64 _initrd_x86_64
} }
_efi_shell
submenu "UEFI Shells" {
_efi_shell
}
elif [ ${grub_cpu} == "arm64" ]; then elif [ ${grub_cpu} == "arm64" ]; then
set default="Archboot Arch Linux AA64" set default="Archboot Arch Linux AA64"
@ -117,7 +109,6 @@ if [ ${grub_platform} == "efi" ]; then
linux /boot/vmlinuz_aarch64 rootfstype=ramfs nr_cpus=1 console=ttyAMA0,115200 console=tty0 loglevel=4 linux /boot/vmlinuz_aarch64 rootfstype=ramfs nr_cpus=1 console=ttyAMA0,115200 console=tty0 loglevel=4
_initrd_aarch64 _initrd_aarch64
} }
elif [ ${grub_cpu} == "i386" ]; then elif [ ${grub_cpu} == "i386" ]; then
set default="Archboot Arch Linux x86_64 - EFI MIXED MODE" set default="Archboot Arch Linux x86_64 - EFI MIXED MODE"
@ -127,10 +118,8 @@ if [ ${grub_platform} == "efi" ]; then
linux /boot/vmlinuz_x86_64 rootfstype=ramfs _IA32_UEFI=1 console=ttyS0,115200 console=tty0 linux /boot/vmlinuz_x86_64 rootfstype=ramfs _IA32_UEFI=1 console=ttyS0,115200 console=tty0
_initrd_x86_64 _initrd_x86_64
} }
submenu "UEFI Shells" { _efi_shell
_efi_shell
}
fi fi
submenu "UEFI Secureboot Tools" { submenu "UEFI Secureboot Tools" {