Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[master] Install plain SLES instead of SLE_HPC (jsc#PED-7841) #877

Merged
merged 8 commits into from
Feb 15, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 14 additions & 0 deletions package/autoyast2.changes
Original file line number Diff line number Diff line change
@@ -1,3 +1,17 @@
-------------------------------------------------------------------
Thu Feb 15 13:59:22 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
lslezak marked this conversation as resolved.
Show resolved Hide resolved
section

-------------------------------------------------------------------
Fri Sep 22 10:25:35 UTC 2023 - Ancor Gonzalez Sosa <ancor@suse.com>

Expand Down
2 changes: 1 addition & 1 deletion package/autoyast2.spec
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
19 changes: 17 additions & 2 deletions src/modules/AutoinstFunctions.rb
Original file line number Diff line number Diff line change
Expand Up @@ -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"

Expand Down Expand Up @@ -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
Expand All @@ -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

Expand Down
2 changes: 1 addition & 1 deletion src/modules/AutoinstStorage.rb
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Loading