From b79bbf852add9ff1ff09138ea35488b26cc7bdb7 Mon Sep 17 00:00:00 2001 From: Jeremy Katz Date: Wed, 6 Feb 2002 21:49:11 +0000 Subject: stage 1 of the partitioning.py cleanup effort -- 1) move the following functions from partitioning.py -> partedUtils.py get_flags, start_sector_to_cyl, end_sector_to_cyl, start_cyl_to_sector, end_cyl_to_sector, getPartSize, getPartSizeMB, getDeviceSizeMB, get_partition_by_name, get_partition_name, get_partition_file_system_type, set_partition_file_system_type, get_partition_drive, map_foreign_to_fsname, filter_partitions, get_logical_partitions, get_primary_partitions, get_raid_partitions, get_lvm_partitions, 2) move PartitioningError and PartitioningWarning classes from partitioning.py -> partErrors.py Change everything that depends on these functions to use the new location --- bootloader.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'bootloader.py') diff --git a/bootloader.py b/bootloader.py index e8cb8f182..f5186e984 100644 --- a/bootloader.py +++ b/bootloader.py @@ -16,6 +16,7 @@ import isys import partitioning +import partedUtils import os import crypt import whrandom @@ -64,9 +65,9 @@ def bootloaderSetupChoices(dispatch, bl, fsset, diskSet, dir): bootDev = fsset.getEntryByMountPoint("/") if not bootDev: bootDev = fsset.getEntryByMountPoint("/boot") - part = partitioning.get_partition_by_name(diskSet.disks, + part = partedUtils.get_partition_by_name(diskSet.disks, bootDev.device.getDevice()) - if part and partitioning.end_sector_to_cyl(part.geom.disk.dev, + if part and partedUtils.end_sector_to_cyl(part.geom.disk.dev, part.geom.end) >= 1024: bl.above1024 = 1 -- cgit