Merge remote-tracking branch 'origin/SLE-15-SP6' into improve_s390_wa…

…rning_master
yast · Mar 15, 2024 · 9f55f47 · 9f55f47
2 parents 8f097b7 + 5940ab8
commit 9f55f47
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 6 deletions.
diff --git a/package/yast2-bootloader.changes b/package/yast2-bootloader.changes
@@ -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)
+- 5.0.7
+
 -------------------------------------------------------------------
 Mon Feb 26 13:30:54 UTC 2024 - Stefan Schubert <schubi@suse.com>
 

diff --git a/package/yast2-bootloader.spec b/package/yast2-bootloader.spec
@@ -17,7 +17,7 @@
 
 
 Name:           yast2-bootloader
-Version:        5.0.6
+Version:        5.0.7
 Release:        0
 Summary:        YaST2 - Bootloader Configuration
 License:        GPL-2.0-or-later

diff --git a/src/lib/bootloader/grub2_widgets.rb b/src/lib/bootloader/grub2_widgets.rb
@@ -360,8 +360,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
           _(
@@ -389,9 +391,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