Skip to content

Commit

Permalink
AutoYaST tries to create primary partitions first
Browse files Browse the repository at this point in the history
  • Loading branch information
imobachgs committed Apr 13, 2018
1 parent 78dd7ba commit e2b8b82
Show file tree
Hide file tree
Showing 2 changed files with 28 additions and 1 deletion.
4 changes: 3 additions & 1 deletion src/lib/y2storage/proposal/autoinst_devices_creator.rb
Expand Up @@ -134,8 +134,10 @@ def best_distribution(planned_partitions, disk_names)
# @return [PartitionCreatorResult]
def create_partitions(new_partitions, disk_names)
log.info "Partitions to create: #{new_partitions}"
primary, non_primary = new_partitions.partition(&:primary)
parts_to_create = primary + non_primary

dist = best_distribution(new_partitions, disk_names)
dist = best_distribution(parts_to_create, disk_names)
raise NoDiskSpaceError, "Could not find a valid partitioning distribution" if dist.nil?
part_creator = Proposal::PartitionCreator.new(original_graph)
part_creator.create_partitions(dist)
Expand Down
25 changes: 25 additions & 0 deletions test/y2storage/proposal/autoinst_devices_creator_test.rb
Expand Up @@ -92,6 +92,31 @@
expect(sdb.partitions).to be_empty
end

context "when primary partitions are wanted" do
let(:primary) do
planned_partition(
mount_point: "/home", filesystem_type: filesystem_type, max_size: 5.GiB, weight: 1,
primary: true
)
end

let(:non_primary) do
planned_partition(
mount_point: "/", filesystem_type: filesystem_type, max_size: 5.GiB, weight: 1
)
end

it "places them first" do
result = creator.populated_devicegraph([non_primary, primary], "/dev/sdb")
devicegraph = result.devicegraph
sdb = Y2Storage::Disk.find_by_name(devicegraph, "/dev/sdb")
expect(sdb.partitions).to include(
an_object_having_attributes(name: "/dev/sdb2", filesystem_mountpoint: "/"),
an_object_having_attributes(name: "/dev/sdb1", filesystem_mountpoint: "/home")
)
end
end

context "when a partition is too big" do
let(:new_part) do
Y2Storage::Planned::Partition.new("/home", filesystem_type).tap do |part|
Expand Down

0 comments on commit e2b8b82

Please sign in to comment.