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

move fedora-shim to archboot directory

Browse source
This commit is contained in:
Tobias Powalowski 2021-10-14 12:32:07 +02:00
parent 5bc2f028ad
commit bd4b00d401
2 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
usr/bin/archboot-x86_64-iso.sh
View file

@ -210,7 +210,7 @@ _download_uefi_shell_tianocore() {
_prepare_uefi_X64_GRUB_USB_files() {
mkdir -p "${X86_64}/EFI/BOOT"
cp "/usr/share/archboot/grub//grubx64.efi" "${X86_64}/EFI/BOOT/grubx64.efi"
cp "/usr/share/archboot/grub/grubx64.efi" "${X86_64}/EFI/BOOT/grubx64.efi"
cat << GRUBEOF > "${X86_64}/EFI/BOOT/grubx64.cfg"
insmod part_gpt
insmod part_msdos
@ -262,7 +262,7 @@ GRUBEOF
_prepare_uefi_IA32_GRUB_USB_files() {
mkdir -p "${X86_64}/EFI/BOOT"
cp "/usr/share/archboot/grub//grubia32.efi" "${X86_64}/EFI/BOOT/grubia32.efi"
cp "/usr/share/archboot/grub/grubia32.efi" "${X86_64}/EFI/BOOT/grubia32.efi"
cat << GRUBEOF > "${X86_64}/EFI/BOOT/bootia32.cfg"
insmod part_gpt

8
usr/lib/initcpio/install/archboot_secure_boot
View file

@ -44,13 +44,13 @@ build ()
SHIM=$(mktemp -d /var/tmp/shim.XXXX)
curl --create-dirs -L -O --output-dir "${SHIM}" "${_SHIM_URL}/${_SHIM_VERSION}"
bsdtar -C ${SHIM} -xf "${SHIM}"/"${_SHIM_VERSION}"
add_file "${SHIM}/boot/efi/EFI/fedora/mmx64.efi" "/usr/share/fedora-shim/mmx64.efi"
add_file "${SHIM}/boot/efi/EFI/fedora/shimx64.efi" "/usr/share/fedora-shim/shimx64.efi"
add_file "${SHIM}/boot/efi/EFI/fedora/mmx64.efi" "/usr/share/archboot/fedora-shim/mmx64.efi"
add_file "${SHIM}/boot/efi/EFI/fedora/shimx64.efi" "/usr/share/archboot/fedora-shim/shimx64.efi"
SHIM32=$(mktemp -d /var/tmp/shim32.XXXX)
curl --create-dirs -L -O --output-dir "${SHIM32}" "${_SHIM_URL}/${_SHIM32_VERSION}"
bsdtar -C "${SHIM32}" -xf "${SHIM32}/${_SHIM32_VERSION}"
add_file "${SHIM}/boot/efi/EFI/fedora/mmia32.efi" "/usr/share/fedora-shim/mmia32.efi"
add_file "${SHIM}/boot/efi/EFI/fedora/shimia32.efi" "/usr/share/fedora-shim/shimia32.efi"
add_file "${SHIM}/boot/efi/EFI/fedora/mmia32.efi" "/usr/share/archboot/fedora-shim/mmia32.efi"
add_file "${SHIM}/boot/efi/EFI/fedora/shimia32.efi" "/usr/share/archboot/fedora-shim/shimia32.efi"
# add grub with modules builtin to boot on secure boot
add_file "/usr/share/archboot/grub/grubx64.efi"
add_file "/usr/share/archboot/grub/grubia32.efi"