1 |
commit: 337cbe6b78809ed278d4412df2d13dd69c323834 |
2 |
Author: wiktor w brodlo <wiktor <AT> brodlo <DOT> net> |
3 |
AuthorDate: Thu Jun 30 18:44:08 2011 +0000 |
4 |
Commit: Wiktor W Brodlo <wiktor <AT> brodlo <DOT> net> |
5 |
CommitDate: Thu Jun 30 18:44:08 2011 +0000 |
6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/anaconda.git;a=commit;h=337cbe6b |
7 |
|
8 |
Rearranged the screen order in the dispatcher to follow the handbook |
9 |
|
10 |
--- |
11 |
dispatch.py | 32 +++++++++++++++++++++++++++----- |
12 |
1 files changed, 27 insertions(+), 5 deletions(-) |
13 |
|
14 |
diff --git a/dispatch.py b/dispatch.py |
15 |
index 66eb052..de4ea7e 100644 |
16 |
--- a/dispatch.py |
17 |
+++ b/dispatch.py |
18 |
@@ -66,20 +66,18 @@ log = logging.getLogger("anaconda") |
19 |
# All install steps take the anaconda object as their sole argument. This |
20 |
# gets passed in when we call the function. |
21 |
installSteps = [ |
22 |
+ # Welcome |
23 |
("welcome", ), |
24 |
("language", ), |
25 |
("keyboard", ), |
26 |
("betanag", betaNagScreen, ), |
27 |
+ |
28 |
+ # Preparing the Disks |
29 |
("filtertype", ), |
30 |
("filter", ), |
31 |
("storageinit", storageInitialize, ), |
32 |
("findrootparts", findRootParts, ), |
33 |
("findinstall", ), |
34 |
- ("network", ), |
35 |
- ("timezone", ), |
36 |
- ("accounts", ), |
37 |
- ("useraccounts", ), |
38 |
- ("setuptime", setupTimezone, ), |
39 |
("parttype", ), |
40 |
("cleardiskssel", ), |
41 |
("autopartitionexecute", doAutoPartition, ), |
42 |
@@ -93,9 +91,33 @@ installSteps = [ |
43 |
("upgrademigratefs", ), |
44 |
("storagedone", storageComplete, ), |
45 |
("enablefilesystems", turnOnFilesystems, ), |
46 |
+ |
47 |
+ # Installing the Gentoo Installation Files |
48 |
+ # make.conf |
49 |
+ |
50 |
+ # Installing the Gentoo Base System |
51 |
+ # mirrorselect |
52 |
+ # profile |
53 |
+ # use |
54 |
+ |
55 |
+ # Configuring your System |
56 |
+ ("network", ), |
57 |
+ ("accounts", ), |
58 |
+ ("timezone", ), |
59 |
+ ("setuptime", setupTimezone, ), |
60 |
+ |
61 |
+ # Installing Necessary System Tools |
62 |
+ # syslog and cron |
63 |
+ |
64 |
+ # Configuring the Bootloader |
65 |
("upgbootloader", ), |
66 |
("bootloadersetup", bootloaderSetupChoices, ), |
67 |
("bootloader", ), |
68 |
+ |
69 |
+ # Finalizing your Gentoo Installation |
70 |
+ ("useraccounts", ), |
71 |
+ |
72 |
+ # Install |
73 |
("reposetup", doBackendSetup, ), |
74 |
("tasksel", ), |
75 |
("basepkgsel", doBasePackageSelect, ), |