diff options
| author | Hans de Goede <hdegoede@redhat.com> | 2010-01-26 14:58:36 +0100 |
|---|---|---|
| committer | Hans de Goede <hdegoede@redhat.com> | 2010-01-28 22:08:47 +0100 |
| commit | e32b33c0e1eb2d7b99affa8c1f683626e13e1d2f (patch) | |
| tree | 1f7a4cf1cf2cdff2bf07e0003f2e64db42b04f10 /kickstart.py | |
| parent | 91598d0cd60f92e7a6e8c279df0a72baff31c661 (diff) | |
| download | anaconda-e32b33c0e1eb2d7b99affa8c1f683626e13e1d2f.tar.gz anaconda-e32b33c0e1eb2d7b99affa8c1f683626e13e1d2f.tar.xz anaconda-e32b33c0e1eb2d7b99affa8c1f683626e13e1d2f.zip | |
Hookup new python EDD code (#478996)
Replace all usage of the isys C EDD code with the new storage
python EDD code. Note that this moves the sorting of partition.req_disks
from devices.py to paritioning.py, because sorting now needs access
to the storage object, this also has the added advantange that now we
always allocatePartitions in sorted drive order, even in interactive mode.
Diffstat (limited to 'kickstart.py')
| -rw-r--r-- | kickstart.py | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/kickstart.py b/kickstart.py index 5396fd4ba..a6768ed41 100644 --- a/kickstart.py +++ b/kickstart.py @@ -255,7 +255,8 @@ class Bootloader(commands.bootloader.F12_Bootloader): elif disk.name in anaconda.id.bootloader.drivelist: # remove unpartitioned disks from the drivelist anaconda.id.bootloader.drivelist.remove(disk.name) - anaconda.id.bootloader.drivelist.sort(cmp=isys.compareDrives) + anaconda.id.bootloader.drivelist.sort( + cmp=anaconda.id.storage.compareDisks) # Throw out drives specified that don't exist. if self.driveorder and len(self.driveorder) > 0: @@ -599,7 +600,10 @@ class PartitionData(commands.partition.F12_PartData): storage.doAutoPart = False if self.onbiosdisk != "": - self.disk = isys.doGetBiosDisk(self.onbiosdisk) + for (disk, biosdisk) in storage.eddDict.iteritems(): + if str(biosdisk) == self.onbiosdisk: + self.disk = disk + break if self.disk == "": raise KickstartValueError, formatErrorMsg(self.lineno, msg="Specified BIOS disk %s cannot be determined" % self.onbiosdisk) |