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

improve warning for secure boot on s390 to reflect changes done on ha… #696

Merged
merged 5 commits into from
Mar 15, 2024
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
7 changes: 7 additions & 0 deletions package/yast2-bootloader.changes
Original file line number Diff line number Diff line change
@@ -1,3 +1,10 @@
-------------------------------------------------------------------
Fri Mar 15 10:11:13 UTC 2024 - Josef Reidinger <jreidinger@suse.com>

- Improve warnings and help text for secure boot on s390 to reflect
state with new hardware. (bsc#1219989)
- 4.6.6

-------------------------------------------------------------------
Wed Jan 10 23:16:39 UTC 2024 - Josef Reidinger <jreidinger@suse.com>

Expand Down
2 changes: 1 addition & 1 deletion package/yast2-bootloader.spec
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@


Name: yast2-bootloader
Version: 4.6.5
Version: 4.6.6
Release: 0
Summary: YaST2 - Bootloader Configuration
License: GPL-2.0-or-later
Expand Down
15 changes: 10 additions & 5 deletions src/lib/bootloader/grub2_widgets.rb
Original file line number Diff line number Diff line change
Expand Up @@ -359,8 +359,10 @@ def help
"<p><b>Secure Boot Support</b> if checked enables Secure Boot support.<br>" \
"This does not turn on secure booting. " \
"It only switches to the new secure-boot enabled boot data format. " \
"Note that this new format works only on z15 or later and only for zFCP disks. " \
"The system does not boot if these requirements are not met.</p>"
"Note that this new format works only on z15 or later and "\
"only for some disk types. " \
"For more details see the requirements at " \
"https://www.ibm.com/docs/en/linux-on-systems?topic=introduction-requirements</p>"
)
else
_(
Expand Down Expand Up @@ -388,9 +390,12 @@ def validate

Yast::Popup.ContinueCancel(
_(
"The new secure-boot enabled boot data format works only on z15 " \
"and later and only for zFCP disks.\n\n" \
"The system does not boot if these requirements are not met."
"The secure boot IPL works only on IBM z15, IBM LinuxONE III or later.\n" \
"Also note the following restrictions:" \
"NVMe disks work since IBM LinuxONE III.\n" \
"FC-attached SCSI disks need at least IBM LinuxONE III or IBM z15.\n" \
"ECKD DASDs with CDL layout work on IBM z16, LinuxONE 4 or newer.\n" \
"If these requirements are not met, the system will not IPL in secure mode."
)
)
end
Expand Down
Loading