diff options
Diffstat (limited to 'storage')
| -rw-r--r-- | storage/__init__.py | 2 | ||||
| -rw-r--r-- | storage/devices.py | 2 | ||||
| -rw-r--r-- | storage/partitioning.py | 5 |
3 files changed, 4 insertions, 5 deletions
diff --git a/storage/__init__.py b/storage/__init__.py index 91a75de78..adbcd4d16 100644 --- a/storage/__init__.py +++ b/storage/__init__.py @@ -405,7 +405,7 @@ class Storage(object): log.info("Skipping disk: %s: No media present" % device.name) continue disks.append(device) - disks.sort(key=lambda d: d.name, cmp=isys.compareDrives) + disks.sort(key=lambda d: d.name, cmp=self.compareDisks) return disks @property diff --git a/storage/devices.py b/storage/devices.py index d5ca22bbf..9e9508466 100644 --- a/storage/devices.py +++ b/storage/devices.py @@ -112,7 +112,6 @@ from iutil import notify_kernel, numeric_type from .storage_log import log_method_call from udev import * from formats import get_device_format_class, getFormat, DeviceFormat -from isys import compareDrives import gettext _ = lambda x: gettext.ldgettext("anaconda", x) @@ -917,7 +916,6 @@ class PartitionDevice(StorageDevice): if not exists: # this is a request, not a partition -- it has no parents self.req_disks = self.parents[:] - self.req_disks.sort(key=lambda d: d.name, cmp=compareDrives) for dev in self.parents: dev.removeChild() self.parents = [] diff --git a/storage/partitioning.py b/storage/partitioning.py index b6459339b..d912db93f 100644 --- a/storage/partitioning.py +++ b/storage/partitioning.py @@ -792,7 +792,7 @@ def doPartitioning(storage, exclusiveDisks=None): removeNewPartitions(disks, partitions) free = getFreeRegions(disks) - allocatePartitions(disks, partitions, free) + allocatePartitions(storage, disks, partitions, free) growPartitions(disks, partitions, free) # The number and thus the name of partitions may have changed now, @@ -840,7 +840,7 @@ def doPartitioning(storage, exclusiveDisks=None): # moment to simplify things storage.devicetree._addDevice(device) -def allocatePartitions(disks, partitions, freespace): +def allocatePartitions(storage, disks, partitions, freespace): """ Allocate partitions based on requested features. Non-existing partitions are sorted according to their requested @@ -888,6 +888,7 @@ def allocatePartitions(disks, partitions, freespace): # no disks specified means any disk will do req_disks = disks + req_disks.sort(key=lambda d: d.name, cmp=storage.compareDisks) log.debug("allocating partition: %s ; id: %d ; disks: %s ;\n" "boot: %s ; primary: %s ; size: %dMB ; grow: %s ; " "max_size: %s" % (_part.name, _part.id, req_disks, |