Skip to content

Commit

Permalink
Merge branch 'master' into sd_boot_kernel_param
Browse files Browse the repository at this point in the history
  • Loading branch information
schubi2 committed Apr 25, 2024
2 parents 4b8fba7 + 3a16f9b commit 3383d4c
Show file tree
Hide file tree
Showing 3 changed files with 15 additions and 7 deletions.
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 Apr 5 08:08:09 UTC 2024 - Josef Reidinger <[email protected]>

- Follow up of previous change to use even more precise wording
(bsc#1219989,bsc#1222353)
- 5.0.8

-------------------------------------------------------------------
Fri Mar 15 10:11:13 UTC 2024 - Josef Reidinger <[email protected]>

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: 5.0.7
Version: 5.0.8
Release: 0
Summary: YaST2 - Bootloader Configuration
License: GPL-2.0-or-later
Expand Down
13 changes: 7 additions & 6 deletions src/lib/bootloader/grub2_widgets.rb
Original file line number Diff line number Diff line change
Expand Up @@ -332,13 +332,14 @@ def validate
value == Systeminfo.secure_boot_active?

Yast::Popup.ContinueCancel(
# TRANSLATORS: IPL stands for Initial Program Load, IBM speak for system boot
_(
"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."
"Secure boot IPL has the following minimum system requirements,\n" \
"depending on the boot device to be IPLed:\n" \
"NVMe disk: IBM LinuxONE III or newer.\n" \
"FC-attached SCSI disk: IBM LinuxONE III, IBM z15 or newer.\n" \
"ECKD DASD with CDL layout: IBM z16, LinuxONE 4 or newer.\n" \
"If these requirements are not met, the system can be IPLed in non-secure mode only."
)
)
end
Expand Down

0 comments on commit 3383d4c

Please sign in to comment.