aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorwiktor w brodlo <wiktor@brodlo.net>2011-07-21 13:42:07 +0000
committerwiktor w brodlo <wiktor@brodlo.net>2011-07-21 13:42:07 +0000
commit3c61c0a583e540887f93e0c33bd9a67dce107c8d (patch)
treeb7167520041018178b7891e3fe24030585b86827 /dispatch.py
parentiw/welcome_gui.py: rework the system for easy extensibility (diff)
downloadanaconda-3c61c0a583e540887f93e0c33bd9a67dce107c8d.tar.gz
anaconda-3c61c0a583e540887f93e0c33bd9a67dce107c8d.tar.bz2
anaconda-3c61c0a583e540887f93e0c33bd9a67dce107c8d.zip
dispatch.py: no need for the WelcomeWindow import
Diffstat (limited to 'dispatch.py')
-rw-r--r--dispatch.py20
1 files changed, 9 insertions, 11 deletions
diff --git a/dispatch.py b/dispatch.py
index c3ff6a1..d967258 100644
--- a/dispatch.py
+++ b/dispatch.py
@@ -48,8 +48,6 @@ from backend import writeConfiguration
from packages import doReIPL
-from iw.welcome_gui import WelcomeWindow
-
import logging
log = logging.getLogger("anaconda")
@@ -69,13 +67,13 @@ log = logging.getLogger("anaconda")
# gets passed in when we call the function.
installSteps = [
# Welcome
- ("welcome", WelcomeWindow(None).welcome, ),
+ ("welcome", ),
("language", ),
("keyboard", ),
("betanag", betaNagScreen, ),
# Preparing the Disks
- ("preparedisks", WelcomeWindow(None).preparedisks, ),
+ ("preparedisks", ),
("filtertype", ),
("filter", ),
("storageinit", storageInitialize, ),
@@ -96,38 +94,38 @@ installSteps = [
("enablefilesystems", turnOnFilesystems, ),
# Installing the Gentoo Installation Files
- ("installationfiles", WelcomeWindow(None).installationfiles, ),
+ ("installationfiles", ),
("makeconf", ),
# Installing the Gentoo Base System
- ("basesystem", WelcomeWindow(None).basesystem, ),
+ ("basesystem", ),
("mirrorselect", ),
("mirrorselect-sync", ),
("profile", ),
("use", ),
# Configuring the Kernel
- ("configurekernel", WelcomeWindow(None).configurekernel, ),
+ ("configurekernel", ),
("timezone", ),
("setuptime", setupTimezone, ),
# Configuring your System
- ("configuresystem", WelcomeWindow(None).configuresystem, ),
+ ("configuresystem", ),
("network", ),
("accounts", ),
# Installing Necessary System Tools
- ("systoolswelcome", WelcomeWindow(None).systools, ),
+ ("systoolswelcome", ),
("systools", ),
# Configuring the Bootloader
- ("bootloaderwelcome", WelcomeWindow(None).bootloader, ),
+ ("bootloaderwelcome", ),
("upgbootloader", ),
("bootloadersetup", bootloaderSetupChoices, ),
("bootloader", ),
# Finalizing your Gentoo Installation
- ("finalizing", WelcomeWindow(None).finalizing, ),
+ ("finalizing", ),
("useraccounts", ),
("xorg", ),