From a2433d65feaa5475a94258f34c09c580530dfc72 Mon Sep 17 00:00:00 2001 From: Josef Reidinger Date: Fri, 5 Apr 2024 10:07:43 +0200 Subject: [PATCH 1/6] change wording according to review from IBM (bsc#1219989,bsc#1222353) --- src/lib/bootloader/grub2_widgets.rb | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/lib/bootloader/grub2_widgets.rb b/src/lib/bootloader/grub2_widgets.rb index 646522228..8971bf2cf 100644 --- a/src/lib/bootloader/grub2_widgets.rb +++ b/src/lib/bootloader/grub2_widgets.rb @@ -390,12 +390,12 @@ def validate Yast::Popup.ContinueCancel( _( - "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 From 9b8fd32481c407786e8c83308f3d9159dd3a3f1e Mon Sep 17 00:00:00 2001 From: Josef Reidinger Date: Fri, 5 Apr 2024 10:09:27 +0200 Subject: [PATCH 2/6] 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 d7ad85834..2bfac9673 100644 --- a/package/yast2-bootloader.changes +++ b/package/yast2-bootloader.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Fri Apr 5 08:08:09 UTC 2024 - Josef Reidinger + +- Follow up of previous change to use even more precise wording + (bsc#1219989,bsc#1222353) +- 4.6.7 + ------------------------------------------------------------------- Fri Mar 15 10:11:13 UTC 2024 - Josef Reidinger diff --git a/package/yast2-bootloader.spec b/package/yast2-bootloader.spec index 4db237b52..030addab4 100644 --- a/package/yast2-bootloader.spec +++ b/package/yast2-bootloader.spec @@ -17,7 +17,7 @@ Name: yast2-bootloader -Version: 4.6.6 +Version: 4.6.7 Release: 0 Summary: YaST2 - Bootloader Configuration License: GPL-2.0-or-later From d30df40d178bbc70f209b4d846365f11ba7f786e Mon Sep 17 00:00:00 2001 From: Josef Reidinger Date: Fri, 5 Apr 2024 12:45:00 +0200 Subject: [PATCH 3/6] Add note for translators --- src/lib/bootloader/grub2_widgets.rb | 1 + 1 file changed, 1 insertion(+) diff --git a/src/lib/bootloader/grub2_widgets.rb b/src/lib/bootloader/grub2_widgets.rb index 8971bf2cf..702540e15 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( + # TRANSLATORS: IPL stands for Initial Program Load, IBM speak for system boot _( "Secure boot IPL has the following minimum system requirements,\n" \ "depending on the boot device to be IPLed:\n" \ From 5d73b9c28cac4c5e61be025e8ce11657e24ef7d8 Mon Sep 17 00:00:00 2001 From: Josef Reidinger Date: Fri, 5 Apr 2024 14:00:03 +0200 Subject: [PATCH 4/6] fix rubocop --- src/lib/bootloader/grub2_widgets.rb | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/src/lib/bootloader/grub2_widgets.rb b/src/lib/bootloader/grub2_widgets.rb index 920465274..6669245bc 100644 --- a/src/lib/bootloader/grub2_widgets.rb +++ b/src/lib/bootloader/grub2_widgets.rb @@ -389,17 +389,17 @@ def validate !value || value == Systeminfo.secure_boot_active? - Yast::Popup.ContinueCancel( - # TRANSLATORS: IPL stands for Initial Program Load, IBM speak for system boot - _( - "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." - ) + Yast::Popup.ContinueCancel( + # TRANSLATORS: IPL stands for Initial Program Load, IBM speak for system boot + _( + "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 end From 14dfbd06874296c7e72f3ccf3bec45bd0bced1dd Mon Sep 17 00:00:00 2001 From: Josef Reidinger Date: Fri, 5 Apr 2024 15:13:47 +0200 Subject: [PATCH 5/6] fix version --- package/yast2-bootloader.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/yast2-bootloader.spec b/package/yast2-bootloader.spec index cec51f30f..c6f1f2203 100644 --- a/package/yast2-bootloader.spec +++ b/package/yast2-bootloader.spec @@ -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 From bb7d8ed4f870801d90eec0596d85148cf9392271 Mon Sep 17 00:00:00 2001 From: Josef Reidinger Date: Fri, 5 Apr 2024 15:23:00 +0200 Subject: [PATCH 6/6] fix also changelog --- package/yast2-bootloader.changes | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/yast2-bootloader.changes b/package/yast2-bootloader.changes index 79e1d73a0..6801308d3 100644 --- a/package/yast2-bootloader.changes +++ b/package/yast2-bootloader.changes @@ -3,7 +3,7 @@ Fri Apr 5 08:08:09 UTC 2024 - Josef Reidinger - Follow up of previous change to use even more precise wording (bsc#1219989,bsc#1222353) -- 4.6.7 +- 5.0.8 ------------------------------------------------------------------- Fri Mar 15 10:11:13 UTC 2024 - Josef Reidinger