diff options
| -rw-r--r-- | dispatch.py | 32 | ||||
| -rw-r--r-- | fsset.py | 4 | ||||
| -rw-r--r-- | partitioning.py | 65 |
3 files changed, 17 insertions, 84 deletions
diff --git a/dispatch.py b/dispatch.py index 031890ce4..f8436dfa4 100644 --- a/dispatch.py +++ b/dispatch.py @@ -1,8 +1,22 @@ +# +# dispatch.py: install/upgrade master flow control +# +# Erik Troan <ewt@redhat.com> +# +# Copyright 2001 Red Hat, Inc. +# +# This software may be freely redistributed under the terms of the GNU +# library public license. +# +# You should have received a copy of the GNU Library Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. +# + import string from types import * from packages import readPackages, checkDependencies, doInstall, handleX11Packages from packages import writeConfiguration, writeXConfiguration, writeKSConfiguration, turnOnFilesystems, queryUpgradeContinue -from partitioning import AutoPartition from iutil import makeBootdisk from bootloader import partitioningComplete, writeBootloader from flags import flags @@ -24,19 +38,9 @@ DISPATCH_NOOP = None # in the second case, the function is called directly from the dispatcher installSteps = [ -# XXX for msw partition development -# ( "partition", ("id.fsset", "id.diskset", "id.partrequests") ), ( "language", ("intf", "id.instLanguage") ), ( "keyboard", ("id.instLanguage", "id.keyboard") ), ( "mouse", ("id.mouse", ) ), -# -# uncomment next 4 steps to debug X config easier -# -# ( "videocard", ("dispatch", "id.xconfig", "id.videocard")), -# ( "monitor", ("id.xconfig", "id.monitor") ), -# ( "xcustom", ("id.xconfig", "id.monitor", "id.videocard", -# "id.desktop", "id.comps") ), -# ( "writexconfig", writeXConfiguration, ("id", "instPath")), ( "welcome", () ), ( "reconfigwelcome", () ), ( "reconfigkeyboard", ("id.instLanguage", "id.keyboard" ) ), @@ -44,12 +48,6 @@ installSteps = [ "intf") ), ( "partition", ("id.fsset", "id.diskset", "id.partrequests", "intf")), - #( "partitionmethod", ( "dispatch", )), - #( "fdisk", ( "id.diskset", )), - #( "custom-upgrade", () ), - #( "addswap", () ), - #( "fdisk", () ), - #( "partition", () ), ( "partitiondone", partitioningComplete, ("dispatch", "id.bootloader", "id.fsset", "id.diskset" ) ), @@ -287,7 +287,7 @@ class FATFileSystem(FileSystemType): fileSystemTypeRegister(FATFileSystem()) -class ForeignFileSystemType(FileSystemType): +class ForeignFileSystem(FileSystemType): def __init__(self): FileSystemType.__init__(self) self.formattable = 0 @@ -297,7 +297,7 @@ class ForeignFileSystemType(FileSystemType): def formatDevice(self, entry, progress, message, chroot='/'): return -fileSystemTypeRegister(ForeignFileSystemType()) +fileSystemTypeRegister(ForeignFileSystem()) class PsudoFileSystem(FileSystemType): def __init__(self, name): diff --git a/partitioning.py b/partitioning.py index 19463a9ec..fdc92c2db 100644 --- a/partitioning.py +++ b/partitioning.py @@ -547,68 +547,3 @@ class DiskSet: flags)) part = disk.next_partition(part) return rc - -def AutoPartition (fsset, diskset): - from fsset import * - diskset.deleteAllPartitions () - - spec = PartitionSpec (fsTypes['linux-swap'], (64L * 2048L)) - diskset.addPartition (diskset.driveList()[0], - parted.PARTITION_PRIMARY, spec) - - spec = PartitionSpec (fsTypes['ext2'], (1024L * 2048L)) - diskset.addPartition (diskset.driveList()[0], - parted.PARTITION_PRIMARY, spec) - - device = PartitionDevice (diskset.driveList()[0] + "1") - mountpoint = FileSystemSetEntry (device, 'swap', 'swap') - mountpoint.setFormat(1) - fsset.add(mountpoint) - - device = PartitionDevice (diskset.driveList()[0] + "2") - mountpoint = FileSystemSetEntry (device, '/') - mountpoint.setFormat(1) - fsset.add(mountpoint) - - from log import log - log (diskset.diskState()) - -if __name__ == "__main__": - foo = DiskSet() - foo.deleteAllPartitions () - print foo.diskState () - print '---------------------' - spec = PartitionSpec (fsTypes['ext2'], 12060L) - foo.addPartition ("sda", parted.PARTITION_PRIMARY, spec) - print foo.diskState () - spec = PartitionSpec (fsTypes['ext2'], 16060L) - foo.addPartition ("sda", parted.PARTITION_PRIMARY, spec) - print foo.diskState () - - spec = PartitionSpec (fsTypes['ext2'], 16060L) - foo.addPartition ("sda", parted.PARTITION_PRIMARY, spec) - print foo.diskState () - - spec = PartitionSpec (fsTypes['ext2'], 16060L) - foo.addPartition ("sda", parted.PARTITION_PRIMARY, spec) - print foo.diskState () - - spec = PartitionSpec (fsTypes['ext2'], 16060L) - foo.addPartition ("sda", parted.PARTITION_PRIMARY, spec) - print foo.diskState () - - spec = PartitionSpec (fsTypes['ext2'], 16060L) - foo.addPartition ("sda", parted.PARTITION_PRIMARY, spec) - print foo.diskState () - - spec = PartitionSpec (fsTypes['ext2'], 16060L) - foo.addPartition ("sda", parted.PARTITION_PRIMARY, spec) - print foo.diskState () - - spec = PartitionSpec (fsTypes['ext2'], 16060L) - foo.addPartition ("sda", parted.PARTITION_PRIMARY, spec) - print foo.diskState () - - spec = PartitionSpec (fsTypes['ext2'], 16060L) - foo.addPartition ("sda", parted.PARTITION_PRIMARY, spec) - print foo.diskState () |