diff options
| author | Matt Wilson <msw@redhat.com> | 2000-05-11 20:40:23 +0000 |
|---|---|---|
| committer | Matt Wilson <msw@redhat.com> | 2000-05-11 20:40:23 +0000 |
| commit | 0b4190b75187c23e2768daa913b22a836b60b76d (patch) | |
| tree | 3fb24d7ce3e6a2c6d11e38fb6ed5ae8426b74659 | |
| parent | 5a5e82134a98821bcf9be12307545ef88a09efc8 (diff) | |
| download | anaconda-0b4190b75187c23e2768daa913b22a836b60b76d.tar.gz anaconda-0b4190b75187c23e2768daa913b22a836b60b76d.tar.xz anaconda-0b4190b75187c23e2768daa913b22a836b60b76d.zip | |
genericify
| -rw-r--r-- | installclasses/gnomeclass.py | 15 | ||||
| -rw-r--r-- | installclasses/kde.py | 15 | ||||
| -rw-r--r-- | installclasses/server.py | 6 | ||||
| -rw-r--r-- | installclasses/workstation.py | 13 |
4 files changed, 15 insertions, 34 deletions
diff --git a/installclasses/gnomeclass.py b/installclasses/gnomeclass.py deleted file mode 100644 index 789bb6316..000000000 --- a/installclasses/gnomeclass.py +++ /dev/null @@ -1,15 +0,0 @@ -from workstation import Workstation -from translate import N_ - -class InstallClass(Workstation): - - name = N_("Install GNOME Workstation") - pixmap = "gnome-workstation.png" - - sortPriority = 1 - - def __init__(self, expert): - Workstation.__init__(self, expert) - self.desktop = "GNOME" - self.setGroups(["GNOME Workstation"]) - diff --git a/installclasses/kde.py b/installclasses/kde.py deleted file mode 100644 index 67841e124..000000000 --- a/installclasses/kde.py +++ /dev/null @@ -1,15 +0,0 @@ -from workstation import Workstation -from translate import N_ - -class InstallClass(Workstation): - - name = N_("Install KDE Workstation") - pixmap = "kde-workstation.png" - - sortPriority = 1 - - def __init__(self, expert): - Workstation.__init__(self, expert) - self.desktop = "KDE" - self.setGroups(["KDE Workstation"]) - diff --git a/installclasses/server.py b/installclasses/server.py index 337bfad65..1d90c2283 100644 --- a/installclasses/server.py +++ b/installclasses/server.py @@ -15,10 +15,14 @@ class InstallClass(BaseInstallClass): self.setHostname("localhost.localdomain") if not expert: self.addToSkipList("lilo") - self.addToSkipList("package-selection") self.addToSkipList("authentication") self.setMakeBootdisk(1) + self.showgroups = [ "News Server", + "NFS Server", + "Web Server", + "DNS Name Server" ] + if os.uname ()[4] != 'sparc64': self.addNewPartition('/boot', (16, -1, 0), (None, -1, 0), (0,0)) self.addNewPartition('/', (256, -1, 0), (None, -1, 0), (0,0)) diff --git a/installclasses/workstation.py b/installclasses/workstation.py index 22019f864..2aab43b4e 100644 --- a/installclasses/workstation.py +++ b/installclasses/workstation.py @@ -3,8 +3,11 @@ from installclass import FSEDIT_CLEAR_LINUX from translate import N_ import os -# GNOME and KDE installs are derived from this -class Workstation(BaseInstallClass): +class InstallClass(BaseInstallClass): + name = N_("Install Workstation") + pixmap = "workstation.png" + + sortPriority = 1 def __init__(self, expert): BaseInstallClass.__init__(self) @@ -12,9 +15,13 @@ class Workstation(BaseInstallClass): if not expert: self.addToSkipList("lilo") self.addToSkipList("authentication") - self.addToSkipList("package-selection") self.setMakeBootdisk(1) + self.showgroups = [ "KDE", + "GNOME", + "Games", + "Application Development" ] + if os.uname ()[4] != 'sparc64': self.addNewPartition('/boot', (16, -1, 0), (None,-1,0), (0,0)) self.addNewPartition('/', (700, -1, 1), (None, -1, 0), (0,0)) |