diff options
| author | Hans de Goede <hdegoede@redhat.com> | 2009-04-03 16:05:02 +0200 |
|---|---|---|
| committer | Hans de Goede <hdegoede@redhat.com> | 2009-04-06 19:49:45 +0200 |
| commit | bcb3ff60c76d94c57b7523e739724854b68b7711 (patch) | |
| tree | 23b98ec8180d4149cbcde9afba902e2aae12ec9b /iw | |
| parent | 5b52455b64f73d05e338479d16b761792b4dfd9a (diff) | |
| download | anaconda-bcb3ff60c76d94c57b7523e739724854b68b7711.tar.gz anaconda-bcb3ff60c76d94c57b7523e739724854b68b7711.tar.xz anaconda-bcb3ff60c76d94c57b7523e739724854b68b7711.zip | |
Try to handle devices which live in a subdir of /dev properly
This hopefully fixes cciss (will test once an anaconda with this in
has hit rawhide, so I can use rhts to test). This is the second version of
this patch, this time it also does the / -> ! translation for sysfs names.
Diffstat (limited to 'iw')
| -rw-r--r-- | iw/partition_gui.py | 3 | ||||
| -rw-r--r-- | iw/upgrade_bootloader_gui.py | 3 |
2 files changed, 2 insertions, 4 deletions
diff --git a/iw/partition_gui.py b/iw/partition_gui.py index 24559ee59..0105ef596 100644 --- a/iw/partition_gui.py +++ b/iw/partition_gui.py @@ -139,9 +139,6 @@ class DiskStripeSlice: rc = rc + "%Ld MB" % (self.partition.getSize(unit="MB"),) return rc - def getDeviceName(self): - return self.partition.getDeviceNodeName().split("/")[-1] - def update(self): disk = self.parent.getDisk() (cylinders, heads, sectors) = disk.device.biosGeometry diff --git a/iw/upgrade_bootloader_gui.py b/iw/upgrade_bootloader_gui.py index 08f2403df..f35ce0a98 100644 --- a/iw/upgrade_bootloader_gui.py +++ b/iw/upgrade_bootloader_gui.py @@ -24,6 +24,7 @@ from iw_gui import * import gtk from booty import checkbootloader +from storage.devices import devicePathToName from constants import * import gettext @@ -61,7 +62,7 @@ class UpgradeBootloaderWindow (InstallWindow): self.bl.useGrubVal = 1 else: self.bl.useGrubVal = 0 - self.bl.setDevice(self.bootDev.split("/")[-1]) + self.bl.setDevice(devicePathToName(self.bootDev)) def _newToLibata(self, rootPath): # NOTE: any changes here need to be done in upgrade_bootloader_text too |