diff options
| author | Chris Lumens <clumens@redhat.com> | 2009-02-23 14:17:43 -0500 |
|---|---|---|
| committer | Chris Lumens <clumens@redhat.com> | 2009-03-04 15:37:04 -0500 |
| commit | 930cac9c0de1480543f25c411110d9f615e34693 (patch) | |
| tree | 820804ecf6903a668376855bab15babebc232167 /booty | |
| parent | 38eee03b0803cc286f05c42c969912c576713685 (diff) | |
| download | anaconda-930cac9c0de1480543f25c411110d9f615e34693.tar.gz anaconda-930cac9c0de1480543f25c411110d9f615e34693.tar.xz anaconda-930cac9c0de1480543f25c411110d9f615e34693.zip | |
Update booty to work with the new pyparted (hdegoede).
Diffstat (limited to 'booty')
| -rw-r--r-- | booty/bootloaderInfo.py | 21 |
1 files changed, 8 insertions, 13 deletions
diff --git a/booty/bootloaderInfo.py b/booty/bootloaderInfo.py index b33c11885..73d2781d3 100644 --- a/booty/bootloaderInfo.py +++ b/booty/bootloaderInfo.py @@ -234,13 +234,6 @@ class BootImages: foundDos = 0 for (dev, type) in diskSet.partitionTypes(): if type in dosFilesystems and not foundDos and doesDualBoot(): - import isys - import partedUtils - - part = partedUtils.get_partition_by_name(diskSet.disks, dev) - if part.native_type not in partedUtils.dosPartitionTypes: - continue - try: bootable = checkForBootBlock('/dev/' + dev) devs.append((dev, type)) @@ -254,12 +247,14 @@ class BootImages: # be the correct one to boot with XP using ntfs foundDos = 1 elif type in ('hfs', 'hfs+') and rhpl.getPPCMachine() == "PMac": - import isys - import partedUtils - - part = partedUtils.get_partition_by_name(diskSet.disks, dev) - if partedUtils.get_flags(part) != "boot": - devs.append((dev, type)) + import _ped + + for disk in diskset.disks: + part = disk.getPartitionByPath('/dev/' + dev) + if part: + if not part.getFlag(_ped.PARTITION_BOOT): + devs.append((dev, type)) + break slash = fsset.getEntryByMountPoint('/') if not slash or not slash.device or not slash.fsystem: |