rpms/grub2
7
0
Fork 0
mirror of https://src.fedoraproject.org/rpms/grub2.git synced 2024-11-28 15:46:53 +00:00
Code Issues 24 Projects 4 Releases Packages Wiki Activity Actions

Fix prefix setting with memdisk creation for network boot

Browse source 
Signed-off-by: Robbie Harwood <rharwood@redhat.com>
This commit is contained in:
Robbie Harwood 2022-12-21 22:38:05 +00:00
parent 07531cb006
commit 860cf94442
2 changed files with 8 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
grub.macros
View file

@ -387,12 +387,14 @@ mkdir -p memdisk/fonts \
cp %{4}/unicode.pf2 memdisk/fonts \ cp %{4}/unicode.pf2 memdisk/fonts \
mksquashfs memdisk memdisk.squashfs -comp xz \ mksquashfs memdisk memdisk.squashfs -comp xz \
%{4}./grub-mkimage -O %{1} -o %{2}.orig \\\ %{4}./grub-mkimage -O %{1} -o %{2}.orig \\\
-p /EFI/%{efi_vendor} -d grub-core ${GRUB_MODULES} \\\ -d grub-core ${GRUB_MODULES} \\\
-m memdisk.squashfs \\\ -m memdisk.squashfs \\\
-p /EFI/%{efi_vendor} \\\
--sbat %{4}./sbat.csv \ --sbat %{4}./sbat.csv \
%{4}./grub-mkimage -O %{1} -o %{3}.orig \\\ %{4}./grub-mkimage -O %{1} -o %{3}.orig \\\
-p /EFI/BOOT -d grub-core ${GRUB_MODULES} \\\ -d grub-core ${GRUB_MODULES} \\\
-m memdisk.squashfs \\\ -m memdisk.squashfs \\\
-p /EFI/BOOT \\\
--sbat %{4}./sbat.csv \ --sbat %{4}./sbat.csv \
%{expand:%%define ___pesign_client_cert %{?___pesign_client_cert}%{!?___pesign_client_cert:%{__pesign_client_cert}}} \ %{expand:%%define ___pesign_client_cert %{?___pesign_client_cert}%{!?___pesign_client_cert:%{__pesign_client_cert}}} \
%{?__pesign_client_cert:%{expand:%%define __pesign_client_cert %{___pesign_client_cert}}} \ %{?__pesign_client_cert:%{expand:%%define __pesign_client_cert %{___pesign_client_cert}}} \

5
grub2.spec
View file

@ -17,7 +17,7 @@
Name: grub2 Name: grub2
Epoch: 1 Epoch: 1
Version: 2.06 Version: 2.06
Release: 58%{?dist} Release: 59%{?dist}
Summary: Bootloader with support for Linux, Multiboot and more Summary: Bootloader with support for Linux, Multiboot and more
License: GPLv3+ License: GPLv3+
URL: http://www.gnu.org/software/grub/ URL: http://www.gnu.org/software/grub/
@ -531,6 +531,9 @@ mv ${EFI_HOME}/grub.cfg.stb ${EFI_HOME}/grub.cfg
%endif %endif
%changelog %changelog
* Wed Dec 21 2022 Robbie Harwood <rharwood@redhat.com> - 2.06-59
- Fix prefix setting with memdisk creation for network boot
* Wed Dec 14 2022 Robbie Harwood <rharwood@redhat.com> - 2.06-58 * Wed Dec 14 2022 Robbie Harwood <rharwood@redhat.com> - 2.06-58
- ppc64le: fix lpar cas5 - ppc64le: fix lpar cas5
- Resolves: #2152547 - Resolves: #2152547