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

…rning_master

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>
 
@@ -24,6 +31,7 @@ Wed Jan 10 23:16:39 UTC 2024 - Josef Reidinger <jreidinger@suse.com>
 
 - Do not try finding undefined bootloader name to avoid error
   in logs (bsc#1218700)
+<<<<<<< HEAD
 - 5.0.3
 
 -------------------------------------------------------------------
@@ -59,6 +67,22 @@ Thu Jun 15 09:51:19 UTC 2023 - José Iván López González <jlopez@suse.com>
 - Persist zfcp.allow_lun_scan kernel option for s390 arch
   (needed for gh#openSUSE/agama#626).
 - 4.6.2
+=======
+- 4.6.5
+
+-------------------------------------------------------------------
+Thu Sep  7 13:44:17 UTC 2023 - Josef Reidinger <jreidinger@suse.com>
+
+- Backport:
+-- support 32 bit UEFI firmware on x86_64/i386 architecture
+   (bsc#1208003, jsc#PED-2569)
+- 4.6.4
+
+-------------------------------------------------------------------
+Fri Sep 01 19:57:03 UTC 2023 - Josef Reidinger <jreidinger@suse.com>
+
+- Branch package for SP6 (bsc#1208913)
+>>>>>>> origin/SLE-15-SP6
 
 -------------------------------------------------------------------
 Tue Apr 25 20:22:30 UTC 2023 - Josef Reidinger <jreidinger@suse.com>

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

src/lib/bootloader/grub2_widgets.rb

@@ -342,7 +342,7 @@ def store
 
     # Represents switcher for secure boot on EFI
     class SecureBootWidget < CWM::CheckBox
-      include Grub2Helper
+      include Grub2Widget
 
       def initialize
         textdomain "bootloader"
@@ -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