diff options
| -rwxr-xr-x | anaconda | 4 | ||||
| -rw-r--r-- | installclass.py | 24 | ||||
| -rw-r--r-- | iw/installpath.py | 8 | ||||
| -rw-r--r-- | text.py | 8 |
4 files changed, 23 insertions, 21 deletions
@@ -300,9 +300,9 @@ if forceMount: if kickstart: instClass = Kickstart(kickstart) elif reconfigOnly: - instClass = ReconfigStation() + instClass = ReconfigStation(expert) else: - instClass = DefaultInstall() + instClass = DefaultInstall(expert) if lang: instClass.addToSkipList("language") diff --git a/installclass.py b/installclass.py index dedad6c13..654e2a3c7 100644 --- a/installclass.py +++ b/installclass.py @@ -217,22 +217,23 @@ class InstallClass: # we need to be able to differentiate between this and custom class DefaultInstall(InstallClass): - def __init__(self): + def __init__(self, expert): InstallClass.__init__(self) # custom installs are easy :-) class CustomInstall(InstallClass): - def __init__(self): + def __init__(self, expert): InstallClass.__init__(self) # GNOME and KDE installs are derived from this class Workstation(InstallClass): - def __init__(self): + def __init__(self, expert): InstallClass.__init__(self) self.setHostname("localhost.localdomain") - self.addToSkipList("lilo") + if not expert: + self.addToSkipList("lilo") self.addToSkipList("authentication") self.addToSkipList("partition") self.addToSkipList("package-selection") @@ -248,26 +249,27 @@ class Workstation(InstallClass): class GNOMEWorkstation(Workstation): - def __init__(self): - Workstation.__init__(self) + def __init__(self, expert): + Workstation.__init__(self, expert) self.desktop = "GNOME" self.setGroups(["GNOME Workstation"]) self.addToSkipList("package-selection") class KDEWorkstation(Workstation): - def __init__(self): - Workstation.__init__(self) + def __init__(self, expert): + Workstation.__init__(self, expert) self.desktop = "KDE" self.setGroups(["KDE Workstation"]) class Server(InstallClass): - def __init__(self): + def __init__(self, expert): InstallClass.__init__(self) self.setGroups(["Server"]) self.setHostname("localhost.localdomain") - self.addToSkipList("lilo") + if not expert: + self.addToSkipList("lilo") self.addToSkipList("package-selection") self.addToSkipList("authentication") self.addToSkipList("partition") @@ -287,7 +289,7 @@ class Server(InstallClass): # reconfig machine w/o reinstall class ReconfigStation(InstallClass): - def __init__(self): + def __init__(self, expert): InstallClass.__init__(self) self.setHostname("localhost.localdomain") self.addToSkipList("lilo") diff --git a/iw/installpath.py b/iw/installpath.py index 26697d72a..3f9930195 100644 --- a/iw/installpath.py +++ b/iw/installpath.py @@ -121,14 +121,14 @@ class InstallPathWindow (InstallWindow): break if type == WORKSTATION_GNOME and self.orig != WORKSTATION_GNOME: - self.todo.setClass (installclass.GNOMEWorkstation ()) + self.todo.setClass (installclass.GNOMEWorkstation (self.todo.expert)) elif type == WORKSTATION_KDE and self.orig != WORKSTATION_KDE: - self.todo.setClass (installclass.KDEWorkstation ()) + self.todo.setClass (installclass.KDEWorkstation (self.todo.expert)) elif type == SERVER and self.orig != SERVER: print "SERVER" - self.todo.setClass (installclass.Server ()) + self.todo.setClass (installclass.Server (self.todo.expert)) elif type == CUSTOM and self.orig != CUSTOM: - self.todo.setClass (installclass.CustomInstall ()) + self.todo.setClass (installclass.CustomInstall (self.todo.expert)) def toggled (self, widget, type): if not widget.get_active (): return @@ -217,13 +217,13 @@ class InstallPathWindow: intf.steps = intf.commonSteps + intf.installSteps todo.upgrade = 0 if (choice == 0 and orig != 0): - todo.setClass(installclass.GNOMEWorkstation()) + todo.setClass(installclass.GNOMEWorkstation(todo.expert)) elif (choice == 1 and orig != 1): - todo.setClass(installclass.KDEWorkstation()) + todo.setClass(installclass.KDEWorkstation(todo.expert)) elif (choice == 2 and orig != 2): - todo.setClass(installclass.Server()) + todo.setClass(installclass.Server(todo.expert)) elif (choice == 3 and orig != 3): - todo.setClass(installclass.CustomInstall()) + todo.setClass(installclass.CustomInstall(todo.expert)) return INSTALL_OK class UpgradeExamineWindow: |