diff options
| author | Jeremy Katz <katzj@redhat.com> | 2003-05-20 15:26:00 +0000 |
|---|---|---|
| committer | Jeremy Katz <katzj@redhat.com> | 2003-05-20 15:26:00 +0000 |
| commit | 1f3bf130e3705ed4d77af08cf51c12128ab5424d (patch) | |
| tree | 9f5d2f3b64e7aa17b261e911cb1fff0547451e7d /dispatch.py | |
| parent | 445f36acfd30cd71b89e8ed7385b74cb9da0f2dc (diff) | |
| download | anaconda-1f3bf130e3705ed4d77af08cf51c12128ab5424d.tar.gz anaconda-1f3bf130e3705ed4d77af08cf51c12128ab5424d.tar.xz anaconda-1f3bf130e3705ed4d77af08cf51c12128ab5424d.zip | |
merge from taroon branch to HEAD. mostly the package stuff, but also
msw's ctrl-alt-del thing and some arch fixups
Diffstat (limited to 'dispatch.py')
| -rw-r--r-- | dispatch.py | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/dispatch.py b/dispatch.py index 80dec2f7a..c9446ccc0 100644 --- a/dispatch.py +++ b/dispatch.py @@ -108,14 +108,14 @@ installSteps = [ ("desktopchoice", ("intf", "id.instClass", "dispatch")), ("findpackages", upgradeFindPackages, ("intf", "method", "id", "instPath", "dir")), - ("selectlangpackages", selectLanguageSupportGroups, ("id.comps","id.langSupport")), - ("package-selection", ("id.comps", "id.langSupport", "id.instClass", "dispatch")), - ("indivpackage", ("id.comps", "id.hdList")), + ("selectlangpackages", selectLanguageSupportGroups, ("id.grpset","id.langSupport")), + ("package-selection", ("id.grpset", "id.langSupport", "id.instClass", "dispatch")), + ("indivpackage", ("id.grpset")), ("handleX11pkgs", handleX11Packages, ("dir", "intf", "dispatch", "id", "instPath")), ("checkdeps", checkDependencies, ("dir", "intf", "dispatch", "id", "instPath")), - ("dependencies", ("id.comps", "id.dependencies")), + ("dependencies", ("id.grpset", "id.dependencies")), ("confirminstall", ()), ("confirmupgrade", ()), ("install", ("dir", "intf", "id")), @@ -135,10 +135,10 @@ installSteps = [ ("firstboot", firstbootConfiguration, ("id", "instPath")), ("instbootloader", writeBootloader, ("intf", "instPath", "id.fsset", "id.bootloader", "id.langSupport", - "id.comps")), + "id.grpset")), ("bootdisk", ("dir", "dispatch", "id.fsset")), ("makebootdisk", makeBootdisk, ("intf", "dir", "id.floppyDevice", - "id.hdList", "instPath", "id.bootloader")), + "id.grpset", "instPath", "id.bootloader")), # # we dont use videocard and xcustom currently, they are still listed as # steps but are not listed in the list of install steps in installclass.py @@ -149,7 +149,7 @@ installSteps = [ # failed. Needs to be here if we enable videocard and xcustom again. # ("monitor", ("id.xsetup", "id.monitor", "intf")), ("xcustom", ("id.xsetup", "id.monitor", "id.videocard", - "id.desktop", "id.comps", "id.instClass", "instPath")), + "id.desktop", "id.grpset", "id.instClass", "instPath")), ("writexconfig", writeXConfiguration, ("id", "instPath")), ("writeksconfig", writeKSConfiguration, ("id", "instPath")), ("dopostaction", doPostAction, ("id", "instPath")), |