diff options
| author | Mike Fulbright <msf@redhat.com> | 2003-05-14 21:39:28 +0000 |
|---|---|---|
| committer | Mike Fulbright <msf@redhat.com> | 2003-05-14 21:39:28 +0000 |
| commit | 1cfaf749874aba4180d59d3d7a6dbddf51b50c76 (patch) | |
| tree | b92c63e786349fc9a24c679697a567828e897c69 /dispatch.py | |
| parent | c8aad4c1ffdf867f46333af10ba51d7f9740b991 (diff) | |
| download | anaconda-1cfaf749874aba4180d59d3d7a6dbddf51b50c76.tar.gz anaconda-1cfaf749874aba4180d59d3d7a6dbddf51b50c76.tar.xz anaconda-1cfaf749874aba4180d59d3d7a6dbddf51b50c76.zip | |
this change makes it so you are prompted if you monitor was not probed. the prompt occurs after the keyboard and mice screens, so all peripheral questions are at the beginning. previous state of these files tags as before-cambridge-monitor-query-change
Diffstat (limited to 'dispatch.py')
| -rw-r--r-- | dispatch.py | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/dispatch.py b/dispatch.py index b469f97fa..80dec2f7a 100644 --- a/dispatch.py +++ b/dispatch.py @@ -18,6 +18,7 @@ from types import * from constants import * from packages import readPackages, checkDependencies, doInstall from packages import handleX11Packages, writeConfiguration, writeXConfiguration +from packages import checkMonitorOK, setSaneXSettings from packages import writeKSConfiguration, turnOnFilesystems from packages import doMigrateFilesystems from packages import queryUpgradeContinue @@ -58,6 +59,9 @@ installSteps = [ ("language", ("intf", "id.instLanguage")), ("keyboard", ("id.instLanguage.getDefaultKeyboard()", "id.keyboard", "id.xsetup")), ("mouse", ("id.mouse",)), + ("checkmonitorok", checkMonitorOK, ("id.monitor", "dispatch")), + ("monitor", ("id.xsetup", "id.monitor", "intf")), + ("setsanex", setSaneXSettings, ("id.xsetup",)), ("findrootparts", findRootParts, ("intf", "id", "dispatch", "dir", "instPath")), ("findinstall", ("dispatch", "intf", "id", "instPath")), ("installtype", ("dispatch", "id", "method", "intf")), @@ -135,8 +139,15 @@ installSteps = [ ("bootdisk", ("dir", "dispatch", "id.fsset")), ("makebootdisk", makeBootdisk, ("intf", "dir", "id.floppyDevice", "id.hdList", "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 +# ("videocard", ("dispatch", "id.xsetup", "id.videocard", "intf")), - ("monitor", ("id.xsetup", "id.monitor")), +# +# this got moved up to just after mouse config, only runs if monitor probe +# 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")), ("writexconfig", writeXConfiguration, ("id", "instPath")), |