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

yast · Feb 15, 2024 · 1f6ae41 · 1f6ae41
2 parents c2dc345 + ca2274d
commit 1f6ae41
Show file tree

Hide file tree

Showing 4 changed files with 33 additions and 4 deletions.
diff --git a/package/autoyast2.changes b/package/autoyast2.changes
@@ -1,3 +1,17 @@
+-------------------------------------------------------------------
+Thu Feb 15 09:09:59 UTC 2024 - Ladislav Slezák <lslezak@suse.com>
+
+- Install standard SLES when the AY XML profile selects SLE_HPC,
+  it has been dropped in SP6 (jsc#PED-7841)
+- 5.0.2
+
+-------------------------------------------------------------------
+Thu Feb 15 10:19:32 UTC 2024 - Michal Filka <mfilka@suse.com>
+
+- jsc#PED-6407
+  - enabled lvm_vg_reuse to be used in general/storage/proposal
+    section
+
 -------------------------------------------------------------------
 Fri Sep 22 10:25:35 UTC 2023 - Ancor Gonzalez Sosa <ancor@suse.com>
 

diff --git a/package/autoyast2.spec b/package/autoyast2.spec
@@ -22,7 +22,7 @@
 %endif
 
 Name:           autoyast2
-Version:        5.0.1
+Version:        5.0.2
 Release:        0
 Summary:        YaST2 - Automated Installation
 License:        GPL-2.0-only

diff --git a/src/modules/AutoinstFunctions.rb b/src/modules/AutoinstFunctions.rb
@@ -8,6 +8,13 @@ module Yast
   class AutoinstFunctionsClass < Module
     include Yast::Logger
 
+    # special mapping for handling dropped or renamed products,
+    # a map with <old product name> => <new_product name> values
+    PRODUCT_MAPPING = {
+      # the SLE_HPC product was dropped and replaced by standard SLES in SP6
+      "SLE_HPC" => "SLES"
+    }.freeze
+
     def main
       textdomain "installation"
 
@@ -222,7 +229,7 @@ def identify_product_by_selection(profile)
     # FIXME: Currently it returns first found product name. It should be no
     # problem since this section was unused in AY installation so far.
     # However, it might be needed to add a special handling for multiple
-    # poducts in the future. At least we can filter out products which are
+    # products in the future. At least we can filter out products which are
     # not base products.
     #
     # @param profile [Hash] AutoYaST profile
@@ -236,7 +243,15 @@ def base_product_name(profile)
         return nil
       end
 
-      software.fetch_as_array("products").first
+      product = software.fetch_as_array("products").first
+      new_product = PRODUCT_MAPPING[product]
+
+      if new_product
+        log.info "Replacing requested product #{product.inspect} with #{new_product.inspect}"
+        return new_product
+      end
+
+      product
     end
   end
 

diff --git a/src/modules/AutoinstStorage.rb b/src/modules/AutoinstStorage.rb
@@ -320,7 +320,7 @@ def preprocessed_settings(settings)
       preprocessor.run(settings)
     end
 
-    ALLOWED_OVERRIDES = [:lvm, :encryption_password].freeze
+    ALLOWED_OVERRIDES = [:lvm, :lvm_vg_reuse, :encryption_password].freeze
     private_constant :ALLOWED_OVERRIDES
     DELETE_RESIZE_OVERRIDES = [
       :windows_delete_mode, :linux_delete_mode, :other_delete_mode, :resize_windows