Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

bin/generate-zbm: remove gummiboot from default stub list #698

Merged
merged 1 commit into from
Jan 19, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion bin/generate-zbm
Original file line number Diff line number Diff line change
Expand Up @@ -687,7 +687,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
Loading