diff options
| author | Peter Jones <pjones@redhat.com> | 2007-07-26 14:15:42 +0000 |
|---|---|---|
| committer | Peter Jones <pjones@redhat.com> | 2007-07-26 14:15:42 +0000 |
| commit | 2b53dbb0a2e284f54f616f48e439cc060e7a3f46 (patch) | |
| tree | d33891311055a7ff4b0d08661f037e49bbff3463 /partitions.py | |
| parent | b5b0e34ce8a389eb3c897dd9b0cdeacc044b63b8 (diff) | |
| download | anaconda-2b53dbb0a2e284f54f616f48e439cc060e7a3f46.tar.gz anaconda-2b53dbb0a2e284f54f616f48e439cc060e7a3f46.tar.xz anaconda-2b53dbb0a2e284f54f616f48e439cc060e7a3f46.zip | |
- Enable booting from GPT on non-EFI systems.
Diffstat (limited to 'partitions.py')
| -rw-r--r-- | partitions.py | 14 |
1 files changed, 3 insertions, 11 deletions
diff --git a/partitions.py b/partitions.py index 5abc7fb93..e716c8f50 100644 --- a/partitions.py +++ b/partitions.py @@ -800,10 +800,6 @@ class Partitions: boot.extend(self.requests) self.requests = boot - def hasGptLabel(self, diskset, device): - disk = diskset.disks[device] - return disk.type.name == "gpt" - def sanityCheckAllRequests(self, diskset, baseChecks = 0): """Do a sanity check of all of the requests. @@ -853,7 +849,7 @@ class Partitions: if ok: for br in getBaseReqs([bootreq,]): (disk, num) = fsset.getDiskPart(br.device) - if not self.hasGptLabel(diskset, disk): + if not partedUtils.hasGptLabel(diskset, disk): ok = False if not ok: errors.append(_("You must create a /boot/efi partition of " @@ -865,16 +861,12 @@ class Partitions: (dev, num) = fsset.getDiskPart(br.device) if iutil.isMactel(): - if self.hasGptLabel(diskset, dev) and int(num) > 4: + 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.")) - elif self.hasGptLabel(diskset, dev): - errors.append(_("Your boot partition is on a disk " - "using the GPT partitioning scheme " - "but this machine cannot boot using " - "GPT.")) if rhpl.getArch() == "ia64": bootreq = self.getRequestByMountPoint("/boot/efi") |