diff -u -r /afs/athena/system/rhlinux/redhat-6.2/RedHat/instimage/usr/lib/anaconda/installclass.py /afs/sipb/system/rhlinux/redhat-6.2/RedHat/instimage/usr/lib/anaconda/installclass.py --- /afs/athena/system/rhlinux/redhat-6.2/RedHat/instimage/usr/lib/anaconda/installclass.py Wed Mar 8 15:09:37 2000 +++ /afs/sipb/system/rhlinux/redhat-6.2/RedHat/instimage/usr/lib/anaconda/installclass.py Fri Aug 25 22:35:34 2000 @@ -230,7 +230,7 @@ def __init__(self, expert): InstallClass.__init__(self) -# GNOME and KDE installs are derived from this +# GNOME, KDE and Athena installs are derived from this class Workstation(InstallClass): def __init__(self, expert): @@ -263,6 +263,59 @@ Workstation.__init__(self, expert) self.desktop = "KDE" self.setGroups(["KDE Workstation"]) + +class AthenaWorkstation(Workstation): + + def __init__(self, expert): + Workstation.__init__(self, expert) + # Set desktop to be GNOME do that we end up with a default + # runlevel of 5 and dm starts. + self.desktop = "GNOME" + self.addNewPartition('/usr/vice/cache', 100, 130, 0, None) + self.setGroups(["Athena Workstation"]) + self.setPostScript(''' +#!/bin/sh + +ATHENAVERSION=8.4.0 +ROOT=/ + +# Get network address: +ADDR=`grep -i ipaddr /etc/sysconfig/network-scripts/ifcfg-eth0 \ + |sed -e 's/^.*=//'` +HOSTNAME=`chroot $ROOT host $ADDR | awk '{print $5}' | tr '[A-Z]' '[a-z]'` + +# Change default runlevel to 5 (X11) +$ROOT/bin/sed -e 's/id:3/id:5/' < $ROOT/etc/inittab > /tmp/inittab +mv /tmp/inittab $ROOT/etc/inittab + + +echo "Installed by SIPB Installer on `date`" > $ROOT/etc/athena/version +echo -n "Athena Workstation (linux) Version " >> $ROOT/etc/athena/version +echo -n "$ATHENAVERSION " >> $ROOT/etc/athena/version +TZ=US/Eastern date >> $ROOT/etc/athena/version + +MACHINE=`uname -m` +OS=`uname -s` + +$ROOT/bin/sed -e "s/localhost.localdomain/$HOSTNAME/" \ + -e "s/PUBLIC=false/PUBLIC=false/" \ + -e "s/ADDR=/ADDR=$ADDR/" \ + -e "s/HOST=/HOST=$HOSTNAME/" \ + -e "s/MACHINE=i[3456]86/MACHINE=$MACHINE/" \ + $ROOT/etc/athena/rc.conf > /tmp/rc.conf + +cat <>/tmp/rc.conf +AFSCLIENT=true; export AFSCLIENT; # AFS client +AFSADJUST=true; export AFSADJUST; # Adjust AFS cache-size? +eof + +mv /tmp/rc.conf $ROOT/etc/athena/rc.conf + + +touch /var/athena/release-rpms + +''') + class Server(InstallClass): Only in /afs/sipb/system/rhlinux/redhat-6.2/RedHat/instimage/usr/lib/anaconda: installclass.py~ diff -u -r /afs/athena/system/rhlinux/redhat-6.2/RedHat/instimage/usr/lib/anaconda/iw/installpath.py /afs/sipb/system/rhlinux/redhat-6.2/RedHat/instimage/usr/lib/anaconda/iw/installpath.py --- /afs/athena/system/rhlinux/redhat-6.2/RedHat/instimage/usr/lib/anaconda/iw/installpath.py Wed Mar 8 15:09:42 2000 +++ /afs/sipb/system/rhlinux/redhat-6.2/RedHat/instimage/usr/lib/anaconda/iw/installpath.py Sat Aug 19 03:53:30 2000 @@ -29,15 +29,18 @@ INSTALL = 1 CUSTOM = 2 -WORKSTATION_GNOME = 3 -WORKSTATION_KDE = 4 -SERVER = 5 +WORKSTATION_ATHENA = 3 +WORKSTATION_GNOME = 4 +WORKSTATION_KDE = 5 +SERVER = 6 class InstallPathWindow (InstallWindow): - installTypes = ((WORKSTATION_GNOME, _("GNOME Workstation"), + installTypes = ((WORKSTATION_ATHENA, _("Athena Workstation"), + "athena-workstation.png"), + (WORKSTATION_GNOME, _("GNOME Workstation"), "gnome-workstation.png"), - (WORKSTATION_KDE, _("KDE Workstation"), + (WORKSTATION_KDE, _("KDE Workstation"), "kde-workstation.png"), (SERVER, _("Server"), "server.png"), (CUSTOM, _("Custom"), "custom.png")) @@ -125,6 +128,9 @@ elif type == WORKSTATION_KDE and self.orig != WORKSTATION_KDE: self.todo.setClass (installclass.KDEWorkstation (self.todo.expert)) needNewDruid = 1 + elif type == WORKSTATION_ATHENA and self.orig != WORKSTATION_ATHENA: + self.todo.setClass (installclass.AthenaWorkstation (self.todo.expert)) + needNewDruid = 1 elif type == SERVER and self.orig != SERVER: self.todo.setClass (installclass.Server (self.todo.expert)) needNewDruid = 1 @@ -182,7 +188,14 @@ self.todo.upgrade = 1 return None + scrolled_containing_box = GtkHBox (FALSE, 2); + scrolled_window = GtkScrolledWindow (None, None); + scrolled_window.set_policy (2,1); + + scrolled_containing_box.pack_start(scrolled_window); + box = GtkVBox (FALSE, 5) + scrolled_window.add_with_viewport(box) installButton = self.pixRadioButton (None, _("Install"), "install.png") installButton.connect ("toggled", self.toggled, INSTALL) @@ -198,7 +211,9 @@ instClass = self.todo.getClass() self.orig = None installButton.set_active(1) - if isinstance(instClass, installclass.GNOMEWorkstation): + if isinstance(instClass, installclass.AthenaWorkstation): + self.orig = WORKSTATION_ATHENA + elif isinstance(instClass, installclass.GNOMEWorkstation): self.orig = WORKSTATION_GNOME elif isinstance(instClass, installclass.KDEWorkstation): self.orig = WORKSTATION_KDE @@ -210,7 +225,7 @@ if (self.orig): default = self.orig else: - default = WORKSTATION_GNOME + default = WORKSTATION_ATHENA self.installBox = GtkVBox (FALSE, 0) group = None @@ -245,7 +260,7 @@ align = GtkAlignment () align.add (InstallPathWindow.fdisk) align.set (0.0, 0.0, 0.0, 0.0) - hbox.pack_start (box, TRUE) + hbox.pack_start (scrolled_containing_box, TRUE) hbox.pack_start (align, FALSE) box = hbox Only in /afs/sipb/system/rhlinux/redhat-6.2/RedHat/instimage/usr/lib/anaconda/iw: installpath.py~ Only in /afs/sipb/system/rhlinux/redhat-6.2/RedHat/instimage/usr/share/anaconda/pixmaps: .xvpics Only in /afs/sipb/system/rhlinux/redhat-6.2/RedHat/instimage/usr/share/anaconda/pixmaps: athena-workstation.png Binary files /afs/athena/system/rhlinux/redhat-6.2/RedHat/instimage/usr/share/anaconda/pixmaps/first.png and /afs/sipb/system/rhlinux/redhat-6.2/RedHat/instimage/usr/share/anaconda/pixmaps/first.png differ Binary files /afs/athena/system/rhlinux/redhat-6.2/RedHat/instimage/usr/share/anaconda/pixmaps/splash.png and /afs/sipb/system/rhlinux/redhat-6.2/RedHat/instimage/usr/share/anaconda/pixmaps/splash.png differ