pool/grub2
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 1136964 from home:michael-chang:branches:Base:System

Browse Source 
- grub2.spec: Add ofnet to signed grub.elf to support powerpc net boot
  installation when secure boot is enabled (bsc#1217761)
- Improved check for disk device when looking for PReP partition
  * 0004-Introduce-prep_load_env-command.patch

OBS-URL: https://build.opensuse.org/request/show/1136964
OBS-URL: https://build.opensuse.org/package/show/Base:System/grub2?expand=0&rev=479
This commit is contained in:
Michael Chang 2024-01-05 08:33:00 +00:00 committed by Git OBS Bridge
parent 8f037866b6
commit 49ae5965c1
3 changed files with 27 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
0004-Introduce-prep_load_env-command.patch
View File

@ -27,7 +27,7 @@ Signed-off-by: Michael Chang <mchang@suse.com>
--- a/grub-core/Makefile.core.def --- a/grub-core/Makefile.core.def
+++ b/grub-core/Makefile.core.def +++ b/grub-core/Makefile.core.def
@@ -2673,3 +2673,9 @@ @@ -2679,3 +2679,9 @@
common = lib/libtasn1_wrap/tests/Test_strings.c; common = lib/libtasn1_wrap/tests/Test_strings.c;
common = lib/libtasn1_wrap/wrap_tests.c; common = lib/libtasn1_wrap/wrap_tests.c;
}; };
@ -39,7 +39,7 @@ Signed-off-by: Michael Chang <mchang@suse.com>
+}; +};
--- /dev/null --- /dev/null
+++ b/grub-core/commands/prep_loadenv.c +++ b/grub-core/commands/prep_loadenv.c
@@ -0,0 +1,230 @@ @@ -0,0 +1,237 @@
+#include <grub/dl.h> +#include <grub/dl.h>
+#include <grub/mm.h> +#include <grub/mm.h>
+#include <grub/file.h> +#include <grub/file.h>
@ -210,6 +210,13 @@ Signed-off-by: Michael Chang <mchang@suse.com>
+ if (!dev) + if (!dev)
+ return grub_errno; + return grub_errno;
+ +
+ /* Only needed for disk device */
+ if (!dev->disk)
+ {
+ err = GRUB_ERR_NONE;
+ goto out;
+ }
+
+ ret = grub_partition_iterate (dev->disk, part_hook, prep); + ret = grub_partition_iterate (dev->disk, part_hook, prep);
+ if (ret == 1 && *prep) + if (ret == 1 && *prep)
+ { + {

8
grub2.changes
View File

@ -1,3 +1,11 @@
-------------------------------------------------------------------
Wed Jan 3 10:05:50 UTC 2024 - Michael Chang <mchang@suse.com>
- grub2.spec: Add ofnet to signed grub.elf to support powerpc net boot
installation when secure boot is enabled (bsc#1217761)
- Improved check for disk device when looking for PReP partition
* 0004-Introduce-prep_load_env-command.patch
------------------------------------------------------------------- -------------------------------------------------------------------
Thu Nov 30 09:41:10 UTC 2023 - Michael Chang <mchang@suse.com> Thu Nov 30 09:41:10 UTC 2023 - Michael Chang <mchang@suse.com>

14
grub2.spec
View File

@ -1,7 +1,7 @@
# #
# spec file for package grub2 # spec file for package grub2
# #
# Copyright (c) 2023 SUSE LLC # Copyright (c) 2024 SUSE LLC
# #
# All modifications and additions to the file contributed by third parties # All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed # remain the property of their copyright owners, unless otherwise agreed
@ -714,8 +714,8 @@ CRYPTO_MODULES="luks luks2 gcry_rijndael gcry_sha1 gcry_sha256 gcry_sha512 crypt
CD_MODULES="${CD_MODULES} chain efifwsetup efinet read tpm tpm2 memdisk tar squash4 xzio" CD_MODULES="${CD_MODULES} chain efifwsetup efinet read tpm tpm2 memdisk tar squash4 xzio"
PXE_MODULES="${PXE_MODULES} efinet" PXE_MODULES="${PXE_MODULES} efinet"
%else %else
CD_MODULES="${CD_MODULES} net" CD_MODULES="${CD_MODULES} net ofnet"
PXE_MODULES="${PXE_MODULES} net" PXE_MODULES="${PXE_MODULES} net ofnet"
%endif %endif
%ifarch x86_64 %ifarch x86_64
@ -831,7 +831,13 @@ echo "bdev=$bdev"
echo "bpart=$bpart" echo "bpart=$bpart"
echo "bpath=$bpath" echo "bpath=$bpath"
if [ -z "$ENV_FS_UUID" ]; then if regexp '^(tftp|http)$' "$bdev"; then
if [ -z "$bpath" ]; then
echo "network booting via $bdev but firmware didn't provide loaded path from sever root"
bpath="/boot/grub2/powerpc-ieee1275"
echo "using bpath=$bpath as fallback path"
fi
elif [ -z "$ENV_FS_UUID" ]; then
echo "Reading vars from ($bdev)" echo "Reading vars from ($bdev)"
prep_load_env "($bdev)" prep_load_env "($bdev)"
fi fi