Skip to content

Fix shim lookup for arm on SUSE #2843

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.

Sign up for GitHub

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

Merged
merged 1 commit into from
Jun 27, 2025
Merged

Fix shim lookup for arm on SUSE #2843

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
3 changes: 2 additions & 1 deletion build-tests/arm/tumbleweed/test-image-live-disk/appliance.kiwi
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
<bootloader-theme>openSUSE</bootloader-theme>
</preferences>
<preferences profiles="Live">
<type image="iso" flags="overlay" firmware="efi" kernelcmdline="console=ttyS0" hybridpersistent_filesystem="ext4" hybridpersistent="true"/>
<type image="iso" flags="overlay" firmware="uefi" kernelcmdline="console=ttyS0" hybridpersistent_filesystem="ext4" hybridpersistent="true"/>
</preferences>
<preferences profiles="Disk">
<type image="oem" firmware="efi" kernelcmdline="console=ttyS0" installiso="true" installboot="install" filesystem="ext4">
Expand Down Expand Up @@ -69,6 +69,7 @@
<package name="timezone"/>
</packages>
<packages type="image" profiles="Live">
<package name="shim"/>
<package name="dracut-kiwi-live"/>
</packages>
<packages type="image" profiles="Disk">
Expand Down
9 changes: 9 additions & 0 deletions kiwi/defaults.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -932,6 +932,10 @@ def get_shim_loader(root_path: str) -> List[shim_loader_type]:
'/usr/share/efi/x86_64/shim.efi',
'bootx64.efi'
),
shim_pattern_type(
'/usr/share/efi/aarch64/shim.efi',
'bootaa64.efi'
),
shim_pattern_type(
'/usr/lib64/efi/shim.efi',
'bootx64.efi'
Expand Down Expand Up @@ -1257,6 +1261,11 @@ def get_signed_grub_loader(
'grub.efi',
'grubx64.efi'
),
grub_pattern_type(
'/usr/share/efi/aarch64/grub.efi',
'grub.efi',
'grubaa64.efi'
),
grub_pattern_type(
'/usr/lib64/efi/grub.efi',
'grub.efi',
Expand Down
3 changes: 3 additions & 0 deletions test/unit/bootloader/config/grub2_test.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,6 +82,7 @@ def setup(self, mock_theme, mock_firmware):
[],
[],
[],
[],
['root_dir/usr/lib64/efi/shim.efi'],
# get_signed_grub_loader(disk)
[],
Expand Down Expand Up @@ -127,6 +128,7 @@ def setup(self, mock_theme, mock_firmware):
[],
[],
[],
[],
['root_dir/usr/lib64/efi/shim.efi'],
# get_signed_grub_loader(iso)
[],
Expand All @@ -137,6 +139,7 @@ def setup(self, mock_theme, mock_firmware):
[],
[],
[],
[],
['root_dir/usr/lib64/efi/grub.efi'],
# get_grub_efi_font_directory
['root_dir/boot/efi/EFI/DIST/fonts']
Expand Down