Skip to content

Commit

Permalink
bin/generate-zbm: remove gummiboot from default stub list
Browse files Browse the repository at this point in the history
gummiboot doesn't work with newer (6.6+?) kernels, so lets stop recommending it as a default. If you still want to use it, set EFI.Stub in your configuration file.
  • Loading branch information
zdykstra committed Nov 25, 2024
1 parent 7bda2d5 commit 3203292
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 7 deletions.
1 change: 0 additions & 1 deletion bin/generate-zbm
Original file line number Diff line number Diff line change
Expand Up @@ -684,7 +684,6 @@ sub createUEFIBundle {
# For now, default stub locations are x86_64 only
my @uefi_stub_defaults = qw(
/usr/lib/systemd/boot/efi/linuxx64.efi.stub
/usr/lib/gummiboot/linuxx64.efi.stub
);

foreach my $stubloc (@uefi_stub_defaults) {
Expand Down
7 changes: 2 additions & 5 deletions docs/general/uefi-booting.rst
Original file line number Diff line number Diff line change
Expand Up @@ -118,11 +118,8 @@ The remaining keys in the ``EFI`` section allow control over where and how UEFI
or ``0``. See the :ref:`description of this key in manual page <config-components>` for more details about its
behavior. Even when versioning is disabled, ``generate-zbm`` still makes a backup of your existing boot image by
replacing its ``.EFI`` extension with ``-backup.EFI`` to provide a fallback.
* ``Stub`` specifies the location of the UEFI stub loader required when creating a bundled executable. Both ``gummiboot``
and its descendant ``systemd-boot`` provide stub loaders; ``gummiboot``, for example, tends to store the loader at
``/usr/lib/gummiboot/linuxx64.efi.stub``. If this key is omitted (as it is by default), ``dracut`` will attempt to
find either the ``systemd-boot`` or ``gummiboot`` version at their expected locations. This key is useful when
automatic detection fails.
* ``Stub`` specifies the location of the UEFI stub loader required while creating a bundled executable when the default
location of the ``systemd-boot`` needs to be changed.

In addition, two options in the ``Kernel`` section of the configuration file are used during bundle creation:

Expand Down
2 changes: 1 addition & 1 deletion docs/man/generate-zbm.5.rst
Original file line number Diff line number Diff line change
Expand Up @@ -120,7 +120,7 @@ EFI

**Stub**

The path to the EFI stub loader used to boot the unified bundle. If not set, a default of either ``/usr/lib/systemd/boot/efi/linuxx64.efi.stub`` or ``/usr/lib/gummiboot/linuxx64.efi.stub`` is assumed.
The path to the EFI stub loader used to boot the unified bundle. If not set, a default of ``/usr/lib/systemd/boot/efi/linuxx64.efi.stub`` is assumed.

**SplashImage**

Expand Down

0 comments on commit 3203292

Please sign in to comment.