merged with master

yast · May 8, 2024 · 3764e0f · 3764e0f
2 parents 709a0ba + 033ac7f
commit 3764e0f
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 12 deletions.
diff --git a/package/yast2-installation.changes b/package/yast2-installation.changes
@@ -1,9 +1,15 @@
 -------------------------------------------------------------------
-Wed Apr 17 12:36:57 UTC 2024 - Stefan Schubert <schubi@suse.com>
+Wed May  8 07:22:28 UTC 2024 - Stefan Schubert <schubi@suse.com>
 
 - Added encryption_method and encryption_pbkdf in the product
   description file (section partitioning/proposal) in order to
-  encrypt the generated partitions (default: no encryption).
+  set the default method/pbkdf for partition encryption.
+- 5.0.10
+
+-------------------------------------------------------------------
+Fri Apr 26 14:09:15 UTC 2024 - Stefan Schubert <schubi@suse.com>
+
+- Handle SystemdBoot mitigations. (bsc#1220892)
 - 5.0.9
 
 -------------------------------------------------------------------

diff --git a/package/yast2-installation.spec b/package/yast2-installation.spec
@@ -16,7 +16,7 @@
 #
 
 Name:           yast2-installation
-Version:        5.0.9
+Version:        5.0.10
 Release:        0
 Summary:        YaST2 - Installation Parts
 License:        GPL-2.0-only
@@ -29,8 +29,8 @@ Source2:        YaST2-Firstboot.service
 BuildRequires:  update-desktop-files
 # Kernel: Use is_zvm from Yast::Arch
 BuildRequires:  yast2 >= 5.0.5
-# Whitelist cio_ignore s390 parameter
-BuildRequires:  yast2-bootloader >= 5.0.4
+# systemd-boot kernel parameters
+BuildRequires:  yast2-bootloader >= 5.0.9
 # storage-ng based version
 BuildRequires:  yast2-country >= 3.3.1
 BuildRequires:  yast2-devtools >= 3.1.10
@@ -75,7 +75,7 @@ Requires:       tar
 Requires:       (yast2-x11 >= 4.5.1 if libyui-qt)
 # Y2Packager::Repository.refresh
 Requires:       yast2 >= 5.0.3
-Requires:       yast2-bootloader >= 5.0.1
+Requires:       yast2-bootloader >= 5.0.9
 Requires:       yast2-country >= 3.3.1
 # Language::GetLanguageItems and other API
 # Language::Set (handles downloading the translation extensions)

diff --git a/src/lib/installation/dialogs/security.rb b/src/lib/installation/dialogs/security.rb
@@ -121,7 +121,7 @@ def polkit_frame
       def cpu_frame
         frame(
           _("CPU"),
-          ::Bootloader::Grub2Widget::CpuMitigationsWidget.new
+          ::Bootloader::CpuMitigationsWidget.new
         )
       end
 

diff --git a/src/lib/transfer/file_from_url.rb b/src/lib/transfer/file_from_url.rb
@@ -451,21 +451,21 @@ def get_file_from_url(scheme:, host:, urlpath:, localfile:,
                 from: "any",
                 to:   "list <map>"
               )
-            Builtins.foreach(disks) do |m|
-              if _Scheme == "usb" && Ops.get_string(m, "bus", "USB") != "SCSI"
+            Builtins.foreach(disks) do |disk|
+              if _Scheme == "usb" && Ops.get_string(disk, "bus", "USB") != "SCSI"
                 next
               end
-              if Builtins.haskey(m, "dev_name")
+              if Builtins.haskey(disk, "dev_name")
                 i = 0
-                dev = Ops.get_string(m, "dev_name", "")
+                dev = Ops.get_string(disk, "dev_name", "")
                 deviceList = Builtins.add(
                   deviceList,
                   Builtins.substring(dev, 5)
                 )
                 begin
                   i = Ops.add(i, 1)
                   dev = Ops.add(
-                    Ops.get_string(m, "dev_name", ""),
+                    Ops.get_string(disk, "dev_name", ""),
                     Builtins.sformat("%1", i)
                   )
                   if SCR.Read(path(".target.lstat"), dev) != {}