Merge 90c13f2 into 05ea8cd

openSUSE · Apr 10, 2024 · 9f7bc27 · 9f7bc27
2 parents 05ea8cd + 90c13f2
commit 9f7bc27
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 2 deletions.
diff --git a/service/lib/agama/dbus/storage/volume_conversion/from_dbus.rb b/service/lib/agama/dbus/storage/volume_conversion/from_dbus.rb
@@ -53,6 +53,7 @@ def convert
             builder = Agama::Storage::VolumeTemplatesBuilder.new_from_config(config)
             builder.for(dbus_volume["MountPath"] || "").tap do |target|
               valid_dbus_properties.each { |p| conversion(target, p) }
+              target.max_size = Y2Storage::DiskSize.unlimited unless dbus_volume.key?("MaxSize")
             end
           end
 

diff --git a/service/package/rubygem-agama-yast.changes b/service/package/rubygem-agama-yast.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Wed Apr 10 11:35:53 UTC 2024 - Ladislav Slezák <lslezak@suse.com>
+
+- Fixed setting unlimited maximum partition size
+  (gh#openSUSE/agama#1065)
+
 -------------------------------------------------------------------
 Wed Apr  3 15:12:05 UTC 2024 - José Iván López González <jlopez@suse.com>
 

diff --git a/service/test/agama/dbus/storage/manager_test.rb b/service/test/agama/dbus/storage/manager_test.rb
@@ -391,7 +391,8 @@
             expect(volume.mount_path).to eq("/")
             expect(volume.auto_size).to eq(false)
             expect(volume.min_size.to_i).to eq(5 * (1024**3))
-            expect(volume.max_size.to_i).to eq(20 * (1024**3))
+            # missing maximum value means unlimited size
+            expect(volume.max_size.to_i).to eq(-1)
             expect(volume.btrfs.snapshots).to eq(false)
           end
 

diff --git a/service/test/agama/dbus/storage/volume_conversion/from_dbus_test.rb b/service/test/agama/dbus/storage/volume_conversion/from_dbus_test.rb
@@ -113,7 +113,8 @@
         expect(volume.fs_type).to eq(Y2Storage::Filesystems::Type::BTRFS)
         expect(volume.auto_size?).to eq(false)
         expect(volume.min_size.to_i).to eq(5 * (1024**3))
-        expect(volume.max_size.to_i).to eq(10 * (1024**3))
+        # missing maximum value means unlimited size
+        expect(volume.max_size.to_i).to eq(-1)
         expect(volume.btrfs.snapshots?).to eq(false)
       end
     end