Merge pull request #806 from openSUSE/swap_reuse

[Service] Do not reuse swap partitions in the storage proposal
agama-project · Oct 20, 2023 · 12ecc5b · 12ecc5b
2 parents fa7037f + 0d03f82
commit 12ecc5b
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 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
@@ -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
@@ -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

diff --git a/service/package/rubygem-agama.changes b/service/package/rubygem-agama.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Fri Oct 20 08:37:22 UTC 2023 - Ancor Gonzalez Sosa <[email protected]>
+
+- Do not reuse pre-existing swap partitions in the storage proposal
+  (gh#openSUSE/agama#806)
+
 -------------------------------------------------------------------
 Tue Oct 10 08:51:45 UTC 2023 - Ladislav Slezák <[email protected]>
 

diff --git a/service/test/agama/storage/proposal_settings_conversion/to_y2storage_test.rb b/service/test/agama/storage/proposal_settings_conversion/to_y2storage_test.rb
@@ -56,6 +56,7 @@
       expect(y2storage_settings).to have_attributes(
         candidate_devices:   contain_exactly("/dev/sda", "/dev/sdb"),
         root_device:         "/dev/sda",
+        swap_reuse:          :none,
         lvm:                 true,
         separate_vgs:        true,
         lvm_vg_reuse:        false,