Get rid of unused >1024 cylindar check, fix text of boot check exceptions.

1 files changed, 4 insertions, 12 deletions

diff --git a/autopart.py b/autopart.py
index 620c70fe9..43b3c36d2 100644
--- a/autopart.py
+++ b/autopart.py
@@ -76,9 +76,6 @@ def bootRequestCheck(req, diskset):
     if iutil.isEfi():
         if not part.fs_type.name in ("FAT", "fat16", "fat32"):
             return BOOTEFI_NOT_VFAT
-    elif rhpl.getArch() in ("i386", "x86_64"):
-        if partedUtils.end_sector_to_cyl(part.geom.dev, part.geom.end) >= 1024:
-            return BOOT_ABOVE_1024
     elif rhpl.getArch() == "alpha":
         return bootAlphaCheckRequirements(part)
     elif (iutil.getPPCMachine() == "pSeries" or
@@ -1053,21 +1050,16 @@ def doPartitioning(diskset, requests, doRefresh = 1):
     for req in requests.getBootableRequest() or []:
         ret = bootRequestCheck(req, diskset)
         if ret == BOOTALPHA_NOT_BSD:
-            raise PartitioningWarning, _("Boot partition %s doesn't belong to a BSD disk label. SRM won't be able to boot from this partition. Use a partition belonging to a BSD disk label or change this device disk label to BSD.") %(requests.getBootableRequest()[0].mountpoint,)
+            raise PartitioningWarning, _("Boot partition %s doesn't belong to a BSD disk label. SRM won't be able to boot from this partition. Use a partition belonging to a BSD disk label or change this device disk label to BSD.") %(req.mountpoint,)
         elif ret == BOOTALPHA_NO_RESERVED_SPACE:
-            raise PartitioningWarning, _("Boot partition %s doesn't belong to a disk with enough free space at its beginning for the bootloader to live on. Make sure that there's at least 5MB of free space at the beginning of the disk that contains /boot") %(requests.getBootableRequest()[0].mountpoint,)
+            raise PartitioningWarning, _("Boot partition %s doesn't belong to a disk with enough free space at its beginning for the bootloader to live on. Make sure that there's at least 5MB of free space at the beginning of the disk that contains /boot") %(req.mountpoint,)
         elif ret == BOOTEFI_NOT_VFAT:
-            raise PartitioningError, _("Boot partition %s isn't a VFAT partition.  EFI won't be able to boot from this partition.") %(requests.getBootableRequest()[0].mountpoint,)
+            raise PartitioningError, _("Boot partition %s isn't a VFAT partition.  EFI won't be able to boot from this partition.") %(req.mountpoint,)
         elif ret == BOOTIPSERIES_TOO_HIGH:
             raise PartitioningError, _("The boot partition must entirely be in the first 4GB of the disk.  OpenFirmware won't be able to boot this installation.")
-        elif ret == BOOT_ABOVE_1024:
-            # we can't make boot disks anymore and this isn't much of a problem
-            # for "modern" hardware. (#122535)
-            pass
         elif ret != PARTITION_SUCCESS:
             # more specific message?
-            raise PartitioningWarning, _("Boot partition %s may not meet booting constraints for your architecture.") %(requests.getBootableRequest()[0].mountpoint,)
-            #raise PartitioningWarning, _("Boot partition %s may not meet booting constraints for your architecture.  Creation of a boot disk is highly encouraged.") %(requests.getBootableRequest()[0].mountpoint,)
+            raise PartitioningWarning, _("Boot partition %s may not meet booting constraints for your architecture.") %(req.mountpoint,)
 
     # now grow the logical partitions
     growLogicalVolumes(diskset, requests)