Merge 0c634f3 into e7370aa

src/lib/y2storage/autoinst_proposal.rb

@@ -159,8 +159,8 @@ def update_partition_table(disk, ptable_type)
     # @param devicegraph [Devicegraph]         Starting point
     # @return [Array<Planned::DevicesCollection>] List of required planned devices to boot
     def boot_devices(devicegraph, devices)
-      return unless root?(devices.mountable)
-      checker = BootRequirementsChecker.new(devicegraph, planned_devices: devices.mountable)
+      return unless root?(devices.mountable_devices)
+      checker = BootRequirementsChecker.new(devicegraph, planned_devices: devices.mountable_devices)
       checker.needed_partitions
     end
 

src/lib/y2storage/planned/devices_collection.rb

@@ -148,8 +148,8 @@ def all
       # Returns the list of devices that can be mounted
       #
       # @return [Array<Planned::Device>]
-      def mountable
-        @mountable ||= all.select { |d| d.respond_to?(:mount_point) }
+      def mountable_devices
+        @mountable_devices ||= all.select { |d| d.respond_to?(:mount_point) }
       end
     end
   end

src/lib/y2storage/proposal/autoinst_devices_planner.rb

@@ -70,7 +70,7 @@ def planned_devices(drives_map)
         end
 
         collection = Planned::DevicesCollection.new(devices)
-        remove_shadowed_subvols(collection.mountable)
+        remove_shadowed_subvols(collection.mountable_devices)
         collection
       end
 

test/support/autoinst_devices_planner_btrfs.rb

@@ -24,7 +24,7 @@
 RSpec.shared_examples "handles Btrfs snapshots" do
   def planned_root(devices)
     collection = Y2Storage::Planned::DevicesCollection.new(devices)
-    collection.mountable.find { |d| d.mount_point == "/" }
+    collection.mountable_devices.find { |d| d.mount_point == "/" }
   end
 
   let(:devices) { subject.planned_devices(drive) }

test/y2storage/planned/devices_collection_test.rb

@@ -118,7 +118,7 @@
 
   describe "#mountable_devices" do
     it "returns all devices that can be mounted" do
-      expect(collection.mountable).to contain_exactly(
+      expect(collection.mountable_devices).to contain_exactly(
         partition, disk, disk_partition, stray_blk_device, lv0, lv1, md, md_partition
       )
     end