diff options
| author | David Lehman <dlehman@redhat.com> | 2012-08-23 13:59:00 -0500 |
|---|---|---|
| committer | David Lehman <dlehman@redhat.com> | 2012-08-24 18:50:40 -0500 |
| commit | 6c27d6afb57f8b6178723b7788ce54e75dda765d (patch) | |
| tree | 1f3fafc6169367e5cf0b0ab0094022ca40b80997 | |
| parent | d58fd87b86a2f9f2249454b9a0f29805dbbf1f43 (diff) | |
| download | anaconda-6c27d6afb57f8b6178723b7788ce54e75dda765d.tar.gz anaconda-6c27d6afb57f8b6178723b7788ce54e75dda765d.tar.xz anaconda-6c27d6afb57f8b6178723b7788ce54e75dda765d.zip | |
Add mounts before swaps so the default selection is a mount.
| -rw-r--r-- | pyanaconda/ui/gui/spokes/custom.py | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/pyanaconda/ui/gui/spokes/custom.py b/pyanaconda/ui/gui/spokes/custom.py index db8814aa6..7e5b59d93 100644 --- a/pyanaconda/ui/gui/spokes/custom.py +++ b/pyanaconda/ui/gui/spokes/custom.py @@ -450,21 +450,21 @@ class CustomPartitioningSpoke(NormalSpoke, StorageChecker): page = Page() page.pageTitle = root.name - for device in root.swaps: + for (mountpoint, device) in root.mounts.iteritems(): if device not in self._devices: continue - selector = page.addDevice("Swap", - Size(spec="%f MB" % device.size), - None, self.on_selector_clicked) + selector = page.addDevice(self._mountpointName(mountpoint) or device.format.name, Size(spec="%f MB" % device.size), mountpoint, self.on_selector_clicked) selector._device = device selector._root = root - for (mountpoint, device) in root.mounts.iteritems(): + for device in root.swaps: if device not in self._devices: continue - selector = page.addDevice(self._mountpointName(mountpoint) or device.format.name, Size(spec="%f MB" % device.size), mountpoint, self.on_selector_clicked) + selector = page.addDevice("Swap", + Size(spec="%f MB" % device.size), + None, self.on_selector_clicked) selector._device = device selector._root = root |