From dca51ce8c089b09eff3a91b7f95857444e2980ec Mon Sep 17 00:00:00 2001 From: Ancor Gonzalez Sosa Date: Fri, 20 Oct 2023 10:00:05 +0200 Subject: [PATCH] [Service] Do not reuse swap partitions in the storage proposal --- .../agama/storage/proposal_settings_conversion/to_y2storage.rb | 2 ++ service/package/gem2rpm.yml | 3 ++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/service/lib/agama/storage/proposal_settings_conversion/to_y2storage.rb b/service/lib/agama/storage/proposal_settings_conversion/to_y2storage.rb index 0747e291a6..e583db872b 100644 --- a/service/lib/agama/storage/proposal_settings_conversion/to_y2storage.rb +++ b/service/lib/agama/storage/proposal_settings_conversion/to_y2storage.rb @@ -115,6 +115,8 @@ def space_policy_conversion(target) # @param target [Y2Storage::ProposalSettings] def volumes_conversion(target) + target.swap_reuse = :none + volumes = settings.volumes.map { |v| VolumeConversion.to_y2storage(v) } disabled_volumes = missing_volumes.map do |volume| VolumeConversion.to_y2storage(volume).tap { |v| v.proposed = false } diff --git a/service/package/gem2rpm.yml b/service/package/gem2rpm.yml index cc70ad5bc8..5ff69bf1f2 100644 --- a/service/package/gem2rpm.yml +++ b/service/package/gem2rpm.yml @@ -24,7 +24,8 @@ Requires: yast2-installation Requires: yast2-network Requires: yast2-proxy - Requires: yast2-storage-ng >= 4.6.10 + # ProposalSettings#swap_reuse + Requires: yast2-storage-ng >= 5.0.3 Requires: open-iscsi Requires: yast2-iscsi-client >= 4.5.7 Requires: yast2-users