diff options
| -rw-r--r-- | dispatch.py | 3 | ||||
| -rw-r--r-- | installclass.py | 11 |
2 files changed, 5 insertions, 9 deletions
diff --git a/dispatch.py b/dispatch.py index af3b5f5d9..858edb2fe 100644 --- a/dispatch.py +++ b/dispatch.py @@ -19,6 +19,7 @@ from packages import readPackages, checkDependencies, doInstall from packages import handleX11Packages, writeConfiguration, writeXConfiguration from packages import writeKSConfiguration, turnOnFilesystems from packages import queryUpgradeContinue +from autopart import doAutoPartition from floppy import makeBootdisk from bootloader import partitioningComplete, writeBootloader from flags import flags @@ -51,6 +52,8 @@ installSteps = [ ( "findinstall", ("dispatch", "intf", "id", "instPath") ), ( "upgradecontinue", queryUpgradeContinue, ("intf", "dir")), ( "addswap", ("dispatch", "intf", "id.fsset", "id.diskset", "instPath") ), + ( "autopartition", ("id.autoClearPartType", "id.autoClearPartDrives", "id.diskset", "intf")), + ( "autopartitionexecute", doAutoPartition, ("id",)), ( "partition", ("id.fsset", "id.diskset", "id.partrequests", "intf")), ( "partitiondone", partitioningComplete, ("dispatch", "id.bootloader", "id.fsset", "id.diskset" ) ), diff --git a/installclass.py b/installclass.py index 900d44a38..34b094ab0 100644 --- a/installclass.py +++ b/installclass.py @@ -4,12 +4,6 @@ # The interface to BaseInstallClass is *public* -- ISVs/OEMs can customize the # install by creating a new derived type of this class. -# putting these here is a bit of a hack, but we can't switch between -# newtfsedit and gnomefsedit right now, so we have to put up with this -FSEDIT_CLEAR_LINUX = (1 << 1) -FSEDIT_CLEAR_ALL = (1 << 2) -FSEDIT_USE_EXISTING = (1 << 3) - import gettext_rh, os, iutil import string from xf86config import XF86Config @@ -58,9 +52,6 @@ class BaseInstallClass: def getLiloInformation(self): return self.lilo - def getFstab(self): - return self.fstab - def addRaidEntry(self, mntPoint, raidDev, level, devices): # throw an exception for bad raid levels [ 0, 1, 5 ].index(level) @@ -98,6 +89,8 @@ class BaseInstallClass: "mouse", "welcome", "installtype", + "autopartition", + "autopartitionexecute", "partition", "partitiondone", "bootloader", |