Skip to content

Commit

Permalink
Fix scanning partitions on RAID arrays (#2269133)
Browse files Browse the repository at this point in the history
We cannot use get_device_by_device_id here because we get name
from udev.
  • Loading branch information
vojtechtrefny committed Mar 12, 2024
1 parent 6efaca6 commit b54c59f
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions blivet/populator/helpers/partition.py
Original file line number Diff line number Diff line change
Expand Up @@ -46,21 +46,21 @@ def run(self):
log_method_call(self, name=name)
sysfs_path = udev.device_get_sysfs_path(self.data)

device = self._devicetree.get_device_by_device_id(name)
device = self._devicetree.get_device_by_name(name)
if device:
return device

disk = None
disk_name = udev.device_get_partition_disk(self.data)
if disk_name:
disk = self._devicetree.get_device_by_device_id(disk_name)
disk = self._devicetree.get_device_by_name(disk_name)
if disk is None:
# create a device instance for the disk
disk_info = six.next((i for i in udev.get_devices()
if udev.device_get_name(i) == disk_name), None)
if disk_info is not None:
self._devicetree.handle_device(disk_info)
disk = self._devicetree.get_device_by_device_id(disk_name)
disk = self._devicetree.get_device_by_name(disk_name)

if disk is None:
# if the disk is still not in the tree something has gone wrong
Expand Down

0 comments on commit b54c59f

Please sign in to comment.