Skip to content

Make #candidate_device? public #1410

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
joseivanlopez merged 2 commits into from
May 13, 2025
Merged

Make #candidate_device? public #1410

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f6f35f6
Make #candidate_device? public
joseivanlopez May 13, 2025
a596e26
Update version and changelog
joseivanlopez May 13, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions package/yast2-storage-ng.changes
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,10 @@
-------------------------------------------------------------------
Tue May 13 13:29:23 UTC 2025 - José Iván López González <jlopez@suse.com>

- Make method DiskAnalyzer#candidate_device? public
(gh#agama-project/agama#2338).
- 5.0.30

-------------------------------------------------------------------
Thu Apr 10 11:30:44 UTC 2025 - Ancor Gonzalez Sosa <ancor@suse.com>

Expand Down
2 changes: 1 addition & 1 deletion package/yast2-storage-ng.spec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
#

Name: yast2-storage-ng
Version: 5.0.29
Version: 5.0.30
Release: 0
Summary: YaST2 - Storage Configuration
License: GPL-2.0-only OR GPL-3.0-only
Expand Down
38 changes: 19 additions & 19 deletions src/lib/y2storage/disk_analyzer.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Copyright (c) [2015-2021] SUSE LLC
# Copyright (c) [2015-2025] SUSE LLC
#
# All Rights Reserved.
#
Expand Down Expand Up @@ -144,6 +144,21 @@ def candidate_disks
@candidate_disks
end

# Checks whether a device can be used as candidate for installation
#
# A device is candidate for installation if no filesystem belonging to the device is mounted and the
# device does not contain a repository for installation.
#
# Moreover, RAM disks are also discarded.
#
# @param device [BlkDevice]
# @return [Boolean]
def candidate_device?(device)
!contain_mounted_filesystem?(device) &&
!contain_installation_repository?(device) &&
!device.name.match?(/^\/dev\/ram\d+$/)
end

# Look up devicegraph element by device name.
#
# @return [Device]
Expand Down Expand Up @@ -244,7 +259,7 @@ def all_linux_suitable_filesystems

# Finds software RAIDs that are considered valid candidates for a Linux installation
#
# Apart from matching conditions of #candidate_disk?, a valid software RAID candidate must
# Apart from matching conditions of #candidate_device?, a valid software RAID candidate must
# either, have a partition table or do not have children.
#
# See {#candidate_disks} for extra explanations (e.g. the relevance of EFI) and for
Expand All @@ -255,7 +270,7 @@ def candidate_software_raids
return [] unless arch.efiboot?

devicegraph.software_raids.select do |md|
(md.partition_table? || md.children.empty?) && candidate_disk?(md)
(md.partition_table? || md.children.empty?) && candidate_device?(md)
end
end

Expand All @@ -266,26 +281,11 @@ def candidate_software_raids
# @return [Array<BlkDevice>]
def candidate_disk_devices
rejected_disk_devices = candidate_software_raids.map(&:ancestors).flatten
candidate_disk_devices = devicegraph.disk_devices.select { |d| candidate_disk?(d) }
candidate_disk_devices = devicegraph.disk_devices.select { |d| candidate_device?(d) }

candidate_disk_devices - rejected_disk_devices
end

# Checks whether a device can be used as candidate disk for installation
#
# A device is candidate for installation if no filesystem belonging to the device is mounted and the
# device does not contain a repository for installation.
#
# Moreover, RAM disks are also discarded.
#
# @param device [BlkDevice]
# @return [Boolean]
def candidate_disk?(device)
!contain_mounted_filesystem?(device) &&
!contain_installation_repository?(device) &&
!device.name.match?(/^\/dev\/ram\d+$/)
end

# Checks whether a device contains a mounted filesystem
#
# @see #device_filesystems, #mounted_filesystem?
Expand Down