From 9017e54e93c21c767104cea95995705e6f53c4dc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ladislav=20Slez=C3=A1k?= Date: Fri, 6 Sep 2024 09:21:22 +0200 Subject: [PATCH 1/4] Bump version to 4.7.0 --- package/yast2-bootloader.changes | 5 +++++ package/yast2-bootloader.spec | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/package/yast2-bootloader.changes b/package/yast2-bootloader.changes index 2bfac9673..486305514 100644 --- a/package/yast2-bootloader.changes +++ b/package/yast2-bootloader.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Fri Sep 06 07:14:32 UTC 2024 - Ladislav Slezák + +- Branch package for SP7 (bsc#1230201) + ------------------------------------------------------------------- Fri Apr 5 08:08:09 UTC 2024 - Josef Reidinger diff --git a/package/yast2-bootloader.spec b/package/yast2-bootloader.spec index 030addab4..4dd9a0e24 100644 --- a/package/yast2-bootloader.spec +++ b/package/yast2-bootloader.spec @@ -17,7 +17,7 @@ Name: yast2-bootloader -Version: 4.6.7 +Version: 4.7.0 Release: 0 Summary: YaST2 - Bootloader Configuration License: GPL-2.0-or-later From 01c277ccfb10efbcd6f4dbf1e613b8c91d29ae05 Mon Sep 17 00:00:00 2001 From: Josef Reidinger Date: Tue, 5 Nov 2024 10:57:48 +0100 Subject: [PATCH 2/4] sync text about secure boot on s390 to be correct (bsc#1219989) --- src/lib/bootloader/grub2_widgets.rb | 1 + src/lib/bootloader/proposal_client.rb | 11 ++++++++--- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/src/lib/bootloader/grub2_widgets.rb b/src/lib/bootloader/grub2_widgets.rb index 702540e15..c5527a4bc 100644 --- a/src/lib/bootloader/grub2_widgets.rb +++ b/src/lib/bootloader/grub2_widgets.rb @@ -389,6 +389,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 index cc13c1f6e..f087e2972 100644 --- a/src/lib/bootloader/proposal_client.rb +++ b/src/lib/bootloader/proposal_client.rb @@ -379,10 +379,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 ) From 5437e938ce0a71d4ee54e868aa5d532c85484bc0 Mon Sep 17 00:00:00 2001 From: Josef Reidinger Date: Tue, 5 Nov 2024 10:58:51 +0100 Subject: [PATCH 3/4] changes --- package/yast2-bootloader.changes | 7 +++++++ package/yast2-bootloader.spec | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/package/yast2-bootloader.changes b/package/yast2-bootloader.changes index 2bfac9673..c4e623c11 100644 --- a/package/yast2-bootloader.changes +++ b/package/yast2-bootloader.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Tue Nov 5 09:57:58 UTC 2024 - Josef Reidinger + +- Sync warning text from s390 secure boot to be identical in + installation proposal and on running system (bsc#1219989) +- 4.6.8 + ------------------------------------------------------------------- Fri Apr 5 08:08:09 UTC 2024 - Josef Reidinger diff --git a/package/yast2-bootloader.spec b/package/yast2-bootloader.spec index 030addab4..4e2c1dbd7 100644 --- a/package/yast2-bootloader.spec +++ b/package/yast2-bootloader.spec @@ -17,7 +17,7 @@ Name: yast2-bootloader -Version: 4.6.7 +Version: 4.6.8 Release: 0 Summary: YaST2 - Bootloader Configuration License: GPL-2.0-or-later From ab3504cf842526292192065b1cbdc99b099da56f Mon Sep 17 00:00:00 2001 From: Josef Reidinger Date: Tue, 5 Nov 2024 11:02:42 +0100 Subject: [PATCH 4/4] make rubocop happy --- .rubocop.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.rubocop.yml b/.rubocop.yml index d01c10756..d3c2ebb20 100644 --- 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