diff options
| author | Jeremy Katz <katzj@redhat.com> | 2007-10-05 15:22:34 +0000 |
|---|---|---|
| committer | Jeremy Katz <katzj@redhat.com> | 2007-10-05 15:22:34 +0000 |
| commit | d127a14220714d42cb02f4445d9c07955bb68231 (patch) | |
| tree | 41469a21842bd45f6c9ee0144e058928a79481f5 /partitions.py | |
| parent | 50ae86845dcdaa61f12ceaaa044dd1467e213619 (diff) | |
| download | anaconda-d127a14220714d42cb02f4445d9c07955bb68231.tar.gz anaconda-d127a14220714d42cb02f4445d9c07955bb68231.tar.xz anaconda-d127a14220714d42cb02f4445d9c07955bb68231.zip | |
2007-10-05 Jeremy Katz <katzj@redhat.com>
* partitions.py (Partitions.sanityCheckAllRequests.getBaseReqs):
Only get the disk partition for actual partition requests
(#316551, #318841, #300721). Also, only iterate over the requests
on mactels/efi boxes
Diffstat (limited to 'partitions.py')
| -rw-r--r-- | partitions.py | 20 |
1 files changed, 12 insertions, 8 deletions
diff --git a/partitions.py b/partitions.py index 59fa11ca9..8e446a339 100644 --- a/partitions.py +++ b/partitions.py @@ -848,25 +848,29 @@ class Partitions: ok = False if ok: for br in getBaseReqs([bootreq,]): + if not isinstance(br, partRequests.PartitionSpec): + continue + (disk, num) = fsset.getDiskPart(br.device) if not partedUtils.hasGptLabel(diskset, disk): ok = False if not ok: errors.append(_("You must create a /boot/efi partition of " "type FAT and a size of 50 megabytes.")) - else: + elif iutil.isMactel(): # mactel checks bootreqs = self.getBootableRequest() or [] for br in getBaseReqs(bootreqs): + if not isinstance(br, partRequests.PartitionSpec): + continue (dev, num) = fsset.getDiskPart(br.device) - if iutil.isMactel(): - if partedUtils.hasGptLabel(diskset, dev) \ - and int(num) > 4: - errors.append( - _("Your boot partition isn't on one of " - "the first four partitions and thus " - "won't be bootable.")) + if partedUtils.hasGptLabel(diskset, dev) \ + and int(num) > 4: + errors.append( + _("Your boot partition isn't on one of " + "the first four partitions and thus " + "won't be bootable.")) if rhpl.getArch() == "ia64": bootreq = self.getRequestByMountPoint("/boot/efi") |