Skip to content

Enable grub2-bls for arm and riscv64 (bnc#1253222). #727

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 2 commits into from
Nov 24, 2025
Merged

Enable grub2-bls for arm and riscv64 (bnc#1253222). #727

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1fd033e
Enable grub2-bls for arm and riscv64 (bnc#1253222).
schubi2 Nov 21, 2025
6637da4
Replacing dbus-uuidgen by systemd-machine-id-setup.
schubi2 Nov 24, 2025
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
7 changes: 7 additions & 0 deletions package/yast2-bootloader.changes
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,10 @@
-------------------------------------------------------------------
Fri Nov 21 15:23:42 UTC 2025 - Stefan Schubert <[email protected]>

- Enable grub2-bls for arm and riscv64 (bnc#1253222).
- Replacing dbus-uuidgen by systemd-machine-id-setup.
- 5.0.29

-------------------------------------------------------------------
Thu Nov 20 10:19:58 UTC 2025 - Stefan Schubert <[email protected]>

Expand Down
4 changes: 1 addition & 3 deletions package/yast2-bootloader.spec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@


Name: yast2-bootloader
Version: 5.0.28
Version: 5.0.29
Release: 0
Summary: YaST2 - Bootloader Configuration
License: GPL-2.0-or-later
Expand Down Expand Up @@ -55,8 +55,6 @@ Requires: rubygem(%rb_default_ruby_abi:cfa_grub2) >= 1.0.1
# lenses are needed here
Requires: augeas-lenses
Requires: yast2-ruby-bindings >= 1.0.0
# dbus-uuidgen needed by BLS
Requires: dbus-1-tools

# only recommend syslinux, as it is not needed when generic mbr is not used (bsc#1004229)
%ifarch %ix86 x86_64
Expand Down
3 changes: 1 addition & 2 deletions src/lib/bootloader/bls.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -155,8 +155,7 @@ def self.set_authentication
def self.generate_machine_id
Yast::SCR.Execute(Yast::Path.new(".target.remove"), "/etc/machine-id")
begin
Yast::Execute.on_target!("/usr/bin/dbus-uuidgen",
"--ensure=/etc/machine-id")
Yast::Execute.on_target!("/bin/systemd-machine-id-setup")
rescue Cheetah::ExecutionFailed => e
Yast::Report.Error(
format(_(
Expand Down
18 changes: 15 additions & 3 deletions src/lib/bootloader/bootloader_factory.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,12 +110,20 @@ def bootloader_by_name(name)
private

def use_systemd_boot?
# only these architectures are supported.
Yast::ProductFeatures.GetBooleanFeature("globals", "enable_systemd_boot") &&
(Yast::Arch.x86_64 || Yast::Arch.aarch64) # only these architectures are supported.
(Yast::Arch.x86_64 ||
Yast::Arch.aarch64 ||
Yast::Arch.arm ||
Yast::Arch.riscv64)
end

def use_grub2_bls?
(Yast::Arch.x86_64 || Yast::Arch.aarch64) # only these architectures are supported.
# only these architectures are supported.
(Yast::Arch.x86_64 ||
Yast::Arch.aarch64 ||
Yast::Arch.arm ||
Yast::Arch.riscv64)
end

def grub2_efi_installable?
Expand All @@ -124,7 +132,11 @@ def grub2_efi_installable?
end

def bls_installable?
((Yast::Arch.x86_64 || Yast::Arch.i386 || Yast::Arch.aarch64) && Systeminfo.efi?)
((Yast::Arch.x86_64 ||
Yast::Arch.i386 ||
Copy link

@Vogtinator Vogtinator Nov 24, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I wonder about Yast::Arch.i386 here - bls_installable is true but neither grub2-bls nor systemd-boot are available?

Copy link
Member Author

@schubi2 schubi2 Nov 24, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes, and for availability we have use_grub2_bls?....as far I see.

Copy link

@Vogtinator Vogtinator Nov 24, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

use_grub2_bls does not mention i386

Yast::Arch.aarch64 ||
Yast::Arch.arm ||
Yast::Arch.riscv64) && Systeminfo.efi?)
end

def proposed_name
Expand Down
3 changes: 1 addition & 2 deletions test/bls_test.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,8 +71,7 @@
expect(Yast::Execute).to receive(:on_target!)
.with("/usr/bin/sdbootutil", "enroll", "--method=fido2", "--devices=/dev/vda3")
expect(Yast::Execute).to receive(:on_target!)
.with("/usr/bin/dbus-uuidgen",
"--ensure=/etc/machine-id")
.with("/bin/systemd-machine-id-setup")

subject.set_authentication
end
Expand Down