Merge branch 'master' into grub-bls

yast · Nov 11, 2024 · 8ab6946 · 8ab6946
2 parents ac50390 + f5441eb
commit 8ab6946
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 5 deletions.
diff --git a/.rubocop.yml b/.rubocop.yml
@@ -80,7 +80,7 @@ Metrics/BlockLength:
 
 # Configuration parameters: CountComments.
 Metrics/MethodLength:
-  Max: 30 # TODO this should be lower for new code
+  Max: 31 # TODO this should be lower for new code
   Include:
     - 'src/lib/**/*.rb' # be more strict for new code in lib
 

diff --git a/package/yast2-bootloader.changes b/package/yast2-bootloader.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Tue Nov  5 09:57:58 UTC 2024 - Josef Reidinger <jreidinger@suse.com>
+
+- Sync warning text from s390 secure boot to be identical in
+  installation proposal and on running system (bsc#1219989)
+- 5.0.12
+
 -------------------------------------------------------------------
 Wed Aug 14 13:36:03 UTC 2024 - Josef Reidinger <jreidinger@suse.com>
 

diff --git a/package/yast2-bootloader.spec b/package/yast2-bootloader.spec
@@ -17,7 +17,7 @@
 
 
 Name:           yast2-bootloader
-Version:        5.0.11
+Version:        5.0.12
 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
@@ -302,6 +302,7 @@ def validate
           value == Systeminfo.secure_boot_active?
 
         Yast::Popup.ContinueCancel(
+          # text is identical like one in proposal client. Keep in sync!
           # TRANSLATORS: IPL stands for Initial Program Load, IBM speak for system boot
           _(
             "Secure boot IPL has the following minimum system requirements,\n" \

diff --git a/src/lib/bootloader/proposal_client.rb b/src/lib/bootloader/proposal_client.rb
@@ -381,10 +381,15 @@ def single_click_action(option, value)
         bootloader.secure_boot = value
         if value && Yast::Arch.s390
           Yast2::Popup.show(
+            # text is identical like one in grub2_widgets. Keep in sync!
+            # TRANSLATORS: IPL stands for Initial Program Load, IBM speak for system boot
             _(
-              "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."
+              "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."
             ),
             headline: :warning, buttons: :ok
           )