Only in /afs/sipb/system/rhlinux/redhat-6.2/RedHat/RPMS: afs Only in /afs/sipb/system/rhlinux/redhat-6.2/RedHat/RPMS: athena-access-8.4-0.i386.rpm Only in /afs/sipb/system/rhlinux/redhat-6.2/RedHat/RPMS: athena-afs-8.4-0.i386.rpm Only in /afs/sipb/system/rhlinux/redhat-6.2/RedHat/RPMS: athena-aklog-8.4-2.i386.rpm Only in /afs/sipb/system/rhlinux/redhat-6.2/RedHat/RPMS: athena-ares-8.4-0.i386.rpm Only in /afs/sipb/system/rhlinux/redhat-6.2/RedHat/RPMS: athena-athdir-8.4-0.i386.rpm Only in /afs/sipb/system/rhlinux/redhat-6.2/RedHat/RPMS: athena-athinfo-8.4-0.i386.rpm Only in /afs/sipb/system/rhlinux/redhat-6.2/RedHat/RPMS: athena-athinfod-8.4-10.i386.rpm Only in /afs/sipb/system/rhlinux/redhat-6.2/RedHat/RPMS: athena-athrun-8.4-0.i386.rpm Only in /afs/sipb/system/rhlinux/redhat-6.2/RedHat/RPMS: athena-attach-8.4-10.i386.rpm Only in /afs/sipb/system/rhlinux/redhat-6.2/RedHat/RPMS: athena-attachandrun-8.4-0.i386.rpm Only in /afs/sipb/system/rhlinux/redhat-6.2/RedHat/RPMS: athena-autoconf-8.4-0.i386.rpm Only in /afs/sipb/system/rhlinux/redhat-6.2/RedHat/RPMS: athena-base-8.4-5.i386.rpm Only in /afs/sipb/system/rhlinux/redhat-6.2/RedHat/RPMS: athena-bash-8.4-0.i386.rpm Only in /afs/sipb/system/rhlinux/redhat-6.2/RedHat/RPMS: athena-bind-8.4-0.i386.rpm Only in /afs/sipb/system/rhlinux/redhat-6.2/RedHat/RPMS: athena-bugme-8.4-9.i386.rpm Only in /afs/sipb/system/rhlinux/redhat-6.2/RedHat/RPMS: athena-busyd-8.4-0.i386.rpm Only in /afs/sipb/system/rhlinux/redhat-6.2/RedHat/RPMS: athena-cleanup-8.4-0.i386.rpm Only in /afs/sipb/system/rhlinux/redhat-6.2/RedHat/RPMS: athena-config_console-8.4-0.i386.rpm Only in /afs/sipb/system/rhlinux/redhat-6.2/RedHat/RPMS: athena-console-8.4-0.i386.rpm Only in /afs/sipb/system/rhlinux/redhat-6.2/RedHat/RPMS: athena-cviewd-8.4-0.i386.rpm Only in /afs/sipb/system/rhlinux/redhat-6.2/RedHat/RPMS: athena-cxref-8.4-0.i386.rpm Only in /afs/sipb/system/rhlinux/redhat-6.2/RedHat/RPMS: athena-dash-8.4-8.i386.rpm Only in /afs/sipb/system/rhlinux/redhat-6.2/RedHat/RPMS: athena-delete-8.4-0.i386.rpm Only in /afs/sipb/system/rhlinux/redhat-6.2/RedHat/RPMS: athena-dent-8.4-0.i386.rpm Only in /afs/sipb/system/rhlinux/redhat-6.2/RedHat/RPMS: athena-desync-8.4-0.i386.rpm Only in /afs/sipb/system/rhlinux/redhat-6.2/RedHat/RPMS: athena-discuss-8.4-2.i386.rpm Only in /afs/sipb/system/rhlinux/redhat-6.2/RedHat/RPMS: athena-dm-8.4-10.i386.rpm Only in /afs/sipb/system/rhlinux/redhat-6.2/RedHat/RPMS: athena-dotfiles-8.4-7.i386.rpm Only in /afs/sipb/system/rhlinux/redhat-6.2/RedHat/RPMS: athena-emacs-8.4-2.i386.rpm Only in /afs/sipb/system/rhlinux/redhat-6.2/RedHat/RPMS: athena-finger-8.4-2.i386.rpm Only in /afs/sipb/system/rhlinux/redhat-6.2/RedHat/RPMS: athena-from-8.4-2.i386.rpm Only in /afs/sipb/system/rhlinux/redhat-6.2/RedHat/RPMS: athena-fxserver-8.4-2.i386.rpm Only in /afs/sipb/system/rhlinux/redhat-6.2/RedHat/RPMS: athena-get_message-8.4-0.i386.rpm Only in /afs/sipb/system/rhlinux/redhat-6.2/RedHat/RPMS: athena-getcluster-8.4-5.i386.rpm Only in /afs/sipb/system/rhlinux/redhat-6.2/RedHat/RPMS: athena-gettime-8.4-0.i386.rpm Only in /afs/sipb/system/rhlinux/redhat-6.2/RedHat/RPMS: athena-glib-8.4-2.i386.rpm Only in /afs/sipb/system/rhlinux/redhat-6.2/RedHat/RPMS: athena-glue-8.4-10.i386.rpm Only in /afs/sipb/system/rhlinux/redhat-6.2/RedHat/RPMS: athena-gmake-8.4-0.i386.rpm Only in /afs/sipb/system/rhlinux/redhat-6.2/RedHat/RPMS: athena-gms-8.4-0.i386.rpm Only in /afs/sipb/system/rhlinux/redhat-6.2/RedHat/RPMS: athena-gtk-8.4-2.i386.rpm Only in /afs/sipb/system/rhlinux/redhat-6.2/RedHat/RPMS: athena-hesinfo-8.4-0.i386.rpm Only in /afs/sipb/system/rhlinux/redhat-6.2/RedHat/RPMS: athena-hesiod-8.4-0.i386.rpm Only in /afs/sipb/system/rhlinux/redhat-6.2/RedHat/RPMS: athena-hostinfo-8.4-0.i386.rpm Only in /afs/sipb/system/rhlinux/redhat-6.2/RedHat/RPMS: athena-ifhp-8.4-10.i386.rpm Only in /afs/sipb/system/rhlinux/redhat-6.2/RedHat/RPMS: athena-imakecf-8.4-0.i386.rpm Only in /afs/sipb/system/rhlinux/redhat-6.2/RedHat/RPMS: athena-inetd-8.4-9.i386.rpm Only in /afs/sipb/system/rhlinux/redhat-6.2/RedHat/RPMS: athena-intlfonts-8.4-0.i386.rpm Only in /afs/sipb/system/rhlinux/redhat-6.2/RedHat/RPMS: athena-jot-8.4-0.i386.rpm Only in /afs/sipb/system/rhlinux/redhat-6.2/RedHat/RPMS: athena-just-8.4-0.i386.rpm Only in /afs/sipb/system/rhlinux/redhat-6.2/RedHat/RPMS: athena-kermit-8.4-0.i386.rpm Only in /afs/sipb/system/rhlinux/redhat-6.2/RedHat/RPMS: athena-kpasswd-8.4-2.i386.rpm Only in /afs/sipb/system/rhlinux/redhat-6.2/RedHat/RPMS: athena-krb5-8.4-10.i386.rpm Only in /afs/sipb/system/rhlinux/redhat-6.2/RedHat/RPMS: athena-ksrvutil-8.4-2.i386.rpm Only in /afs/sipb/system/rhlinux/redhat-6.2/RedHat/RPMS: athena-lam-8.4-0.i386.rpm Only in /afs/sipb/system/rhlinux/redhat-6.2/RedHat/RPMS: athena-larv-8.4-0.i386.rpm Only in /afs/sipb/system/rhlinux/redhat-6.2/RedHat/RPMS: athena-larvnetd-8.4-0.i386.rpm Only in /afs/sipb/system/rhlinux/redhat-6.2/RedHat/RPMS: athena-lert-8.4-4.i386.rpm Only in /afs/sipb/system/rhlinux/redhat-6.2/RedHat/RPMS: athena-libMu-8.4-0.i386.rpm Only in /afs/sipb/system/rhlinux/redhat-6.2/RedHat/RPMS: athena-libXj-8.4-8.i386.rpm Only in /afs/sipb/system/rhlinux/redhat-6.2/RedHat/RPMS: athena-libal-8.4-0.i386.rpm Only in /afs/sipb/system/rhlinux/redhat-6.2/RedHat/RPMS: athena-libathdir-8.4-0.i386.rpm Only in /afs/sipb/system/rhlinux/redhat-6.2/RedHat/RPMS: athena-libet-8.4-0.i386.rpm Only in /afs/sipb/system/rhlinux/redhat-6.2/RedHat/RPMS: athena-libfxcl-8.4-0.i386.rpm Only in /afs/sipb/system/rhlinux/redhat-6.2/RedHat/RPMS: athena-librkinit-8.4-0.i386.rpm Only in /afs/sipb/system/rhlinux/redhat-6.2/RedHat/RPMS: athena-libss-8.4-0.i386.rpm Only in /afs/sipb/system/rhlinux/redhat-6.2/RedHat/RPMS: athena-listsuidcells-8.4-0.i386.rpm Only in /afs/sipb/system/rhlinux/redhat-6.2/RedHat/RPMS: athena-locker-8.4-10.i386.rpm Only in /afs/sipb/system/rhlinux/redhat-6.2/RedHat/RPMS: athena-lprng-8.4-4.i386.rpm Only in /afs/sipb/system/rhlinux/redhat-6.2/RedHat/RPMS: athena-lprng-misc-8.4-0.i386.rpm Only in /afs/sipb/system/rhlinux/redhat-6.2/RedHat/RPMS: athena-m4-8.4-0.i386.rpm Only in /afs/sipb/system/rhlinux/redhat-6.2/RedHat/RPMS: athena-machtype-8.4-5.i386.rpm Only in /afs/sipb/system/rhlinux/redhat-6.2/RedHat/RPMS: athena-mdoc-8.4-0.i386.rpm Only in /afs/sipb/system/rhlinux/redhat-6.2/RedHat/RPMS: athena-messaged-8.4-0.i386.rpm Only in /afs/sipb/system/rhlinux/redhat-6.2/RedHat/RPMS: athena-mkcred-8.4-0.i386.rpm Only in /afs/sipb/system/rhlinux/redhat-6.2/RedHat/RPMS: athena-motif-8.4-0.i386.rpm Only in /afs/sipb/system/rhlinux/redhat-6.2/RedHat/RPMS: athena-neos-8.4-2.i386.rpm Only in /afs/sipb/system/rhlinux/redhat-6.2/RedHat/RPMS: athena-newpag-8.4-0.i386.rpm Only in /afs/sipb/system/rhlinux/redhat-6.2/RedHat/RPMS: athena-nmh-8.4-2.i386.rpm Only in /afs/sipb/system/rhlinux/redhat-6.2/RedHat/RPMS: athena-nvi-8.4-2.i386.rpm Only in /afs/sipb/system/rhlinux/redhat-6.2/RedHat/RPMS: athena-olc-8.4-2.i386.rpm Only in /afs/sipb/system/rhlinux/redhat-6.2/RedHat/RPMS: athena-passwd-8.4-2.i386.rpm Only in /afs/sipb/system/rhlinux/redhat-6.2/RedHat/RPMS: athena-perl-8.4-0.i386.rpm Only in /afs/sipb/system/rhlinux/redhat-6.2/RedHat/RPMS: athena-quota-8.4-2.i386.rpm Only in /afs/sipb/system/rhlinux/redhat-6.2/RedHat/RPMS: athena-readline-8.4-0.i386.rpm Only in /afs/sipb/system/rhlinux/redhat-6.2/RedHat/RPMS: athena-rkinit-8.4-2.i386.rpm Only in /afs/sipb/system/rhlinux/redhat-6.2/RedHat/RPMS: athena-rkinitd-8.4-2.i386.rpm Only in /afs/sipb/system/rhlinux/redhat-6.2/RedHat/RPMS: athena-rs-8.4-0.i386.rpm Only in /afs/sipb/system/rhlinux/redhat-6.2/RedHat/RPMS: athena-saferm-8.4-0.i386.rpm Only in /afs/sipb/system/rhlinux/redhat-6.2/RedHat/RPMS: athena-sendbug-8.4-0.i386.rpm Only in /afs/sipb/system/rhlinux/redhat-6.2/RedHat/RPMS: athena-sendmail-8.4-4.i386.rpm Only in /afs/sipb/system/rhlinux/redhat-6.2/RedHat/RPMS: athena-session-8.4-0.i386.rpm Only in /afs/sipb/system/rhlinux/redhat-6.2/RedHat/RPMS: athena-ssh-8.4-8.i386.rpm Only in /afs/sipb/system/rhlinux/redhat-6.2/RedHat/RPMS: athena-synctree-8.4-2.i386.rpm Only in /afs/sipb/system/rhlinux/redhat-6.2/RedHat/RPMS: athena-syncupdate-8.4-0.i386.rpm Only in /afs/sipb/system/rhlinux/redhat-6.2/RedHat/RPMS: athena-sysinfo-8.4-0.i386.rpm Only in /afs/sipb/system/rhlinux/redhat-6.2/RedHat/RPMS: athena-tcsh-8.4-0.i386.rpm Only in /afs/sipb/system/rhlinux/redhat-6.2/RedHat/RPMS: athena-tetex-8.4-1.i386.rpm Only in /afs/sipb/system/rhlinux/redhat-6.2/RedHat/RPMS: athena-track-8.4-0.i386.rpm Only in /afs/sipb/system/rhlinux/redhat-6.2/RedHat/RPMS: athena-transcript-8.4-0.i386.rpm Only in /afs/sipb/system/rhlinux/redhat-6.2/RedHat/RPMS: athena-voldump-8.4-0.i386.rpm Only in /afs/sipb/system/rhlinux/redhat-6.2/RedHat/RPMS: athena-wcl-8.4-0.i386.rpm Only in /afs/sipb/system/rhlinux/redhat-6.2/RedHat/RPMS: athena-write-8.4-0.i386.rpm Only in /afs/sipb/system/rhlinux/redhat-6.2/RedHat/RPMS: athena-writed-8.4-0.i386.rpm Only in /afs/sipb/system/rhlinux/redhat-6.2/RedHat/RPMS: athena-ws-8.4-10.i386.rpm Only in /afs/sipb/system/rhlinux/redhat-6.2/RedHat/RPMS: athena-x3270-8.4-0.i386.rpm Only in /afs/sipb/system/rhlinux/redhat-6.2/RedHat/RPMS: athena-xcluster-8.4-0.i386.rpm Only in /afs/sipb/system/rhlinux/redhat-6.2/RedHat/RPMS: athena-xdsc-8.4-0.i386.rpm Only in /afs/sipb/system/rhlinux/redhat-6.2/RedHat/RPMS: athena-xlogin-8.4-10.i386.rpm Only in /afs/sipb/system/rhlinux/redhat-6.2/RedHat/RPMS: athena-xmh-8.4-0.i386.rpm Only in /afs/sipb/system/rhlinux/redhat-6.2/RedHat/RPMS: athena-xntp-8.4-0.i386.rpm Only in /afs/sipb/system/rhlinux/redhat-6.2/RedHat/RPMS: athena-xscreensaver-8.4-8.i386.rpm Only in /afs/sipb/system/rhlinux/redhat-6.2/RedHat/RPMS: athena-zephyr-8.4-8.i386.rpm diff -u -r redhat-6.2/RedHat/base/comps /afs/sipb/system/rhlinux/redhat-6.2/RedHat/base/comps --- redhat-6.2/RedHat/base/comps Wed Mar 8 17:51:19 2000 +++ /afs/sipb/system/rhlinux/redhat-6.2/RedHat/base/comps Fri Aug 25 23:49:06 2000 @@ -44,7 +44,6 @@ getty_ps gmp gpm - gnupg grep groff gzip @@ -55,7 +54,6 @@ i386: isapnptools kbdconfig kernel - kernel-utils i386: ld.so sparc: ld.so less @@ -100,12 +98,10 @@ readline redhat-logos redhat-release - rootfiles rpm sash sed setserial - sendmail shadow-utils sh-utils sparc: silo @@ -123,10 +119,7 @@ tmpwatch utempter util-linux - vim-minimal - vim-common vixie-cron - anacron which zlib sparc: perl @@ -235,7 +228,7 @@ xscreensaver } -1 GNOME { +0 GNOME { @ X Window System audiofile bug-buddy @@ -289,6 +282,494 @@ rep-gtk-libglade xchat xscreensaver +} + +1 Athena Workstation { + ElectricFence + gtk+10 + ImageMagick + MAKEDEV + Mesa + SysVinit + X11R6-contrib + XFree86-100dpi-fonts + XFree86 + XFree86-3DLabs + XFree86-75dpi-fonts + XFree86-8514 + XFree86-AGX + XFree86-FBDev + XFree86-I128 + XFree86-ISO8859-2 + XFree86-ISO8859-2-100dpi-fonts + XFree86-ISO8859-2-75dpi-fonts + XFree86-ISO8859-2-Type1-fonts + XFree86-ISO8859-7 + XFree86-ISO8859-7-100dpi-fonts + XFree86-ISO8859-7-75dpi-fonts + XFree86-ISO8859-7-Type1-fonts + XFree86-ISO8859-9-100dpi-fonts + XFree86-ISO8859-9 + XFree86-ISO8859-9-75dpi-fonts + XFree86-Mach32 + XFree86-Mach64 + XFree86-Mach8 + XFree86-Mono + XFree86-P9000 + XFree86-S3 + XFree86-S3V + XFree86-SVGA + XFree86-VGA16 + XFree86-W32 + XFree86-Xnest + XFree86-Xvfb + XFree86-cyrillic-fonts + XFree86-devel + XFree86-doc + XFree86-libs + XFree86-xfs + Xaw3d + Xaw3d-devel + Xconfigurator + apmd + arpwatch + ash + at + audiofile + audiofile-devel + aumix + authconfig + autoconf + automake + awesfx + basesystem + bash + bc + bdflush + bind-utils + binutils + bison + byacc + bzip2 + cdecl + cdp + chkconfig + chkfontpath + compat-glibc + compat-libs + console-tools + control-panel + cpio + cpp + cproto + cracklib + cracklib-dicts + crontabs + ctags + desktop-backgrounds + dev + dev86 + dialog + diffutils + dip + dosfstools + dump + e2fsprogs + ed + ee + egcs + egcs-c++ + egcs-objc + eject + enlightenment + etcskel + expect + extace + file + filesystem + fileutils + findutils + finger + finger-server + flex + fnlib + fnlib-devel + freetype + freetype-utils + ftp + fwhois + gawk + gd + gd-devel + gdb + gdbm + gdbm-devel + gdm + gedit + gettext + getty_ps + gftp + git + glib + glib-devel + glib10 + glibc + glibc-devel + glibc-profile + gmc + gmp + gnome-audio + gnome-audio-extra + gnome-games + gnome-games-devel + gnome-libs + gnome-libs-devel + gnome-linuxconf + gnome-media + gnome-objc + gnome-objc-devel + gnome-pim + gnome-pim-devel + gnome-users-guide + gnome-utils + gnorpm + gnotepad+ + gqview + grep + groff + gtk+ + gtk+-devel + gtk+ + gtk-engines + gtop + guile + gzip + hdparm + helptool + ical + imlib + imlib-cfgeditor + imlib-devel + indent + indexhtml + inetd + info + ipchains + iputils + irda-utils + isapnptools + ispell + ispell-dicts + kbdconfig + kernelcfg + kudzu + kudzu-devel + ld.so + ldconfig + less + libc + libghttp + libghttp-devel + libglade + libgr + libgr-devel + libgr-progs + libgtop + libgtop-devel + libjpeg + libjpeg-devel + libpng + libpng-devel + libstdc++ + libtermcap + libtermcap-devel + libtiff + libtiff-devel + libungif + libungif-devel + libxml + libxml-devel + libxml10 + lilo + linuxconf + linuxconf-devel + logrotate + losetup + lrzsz + lsof + ltrace + m4 + mailcap + mailx + make + man-pages + mc + metamail + mikmod + mingetty + minicom + mkbootdisk + mkinitrd + mktemp + mkxauth + modemtool + modutils + mount + mouseconfig + mpage + mpg123 + mt-st + multimedia + ncftp + ncompress + ncurses + ncurses-devel + net-tools + netcfg + newt + newt-devel + nmh + ntsysv + passwd + patch + pciutils + pciutils-devel + perl + playmidi + playmidi-X11 + pmake + popt + portmap + ppp + procinfo + procmail + procps + procps-X11 + psmisc + pump + pwdb + pygtk + python + pythonlib + quota + raidtools + rcs + rdate + rdist + readline + readline-devel + redhat-logos + redhat-release + rmt + rpm + rpm-devel + rsh + rsh-server + rsync + rusers + rusers-server + rwho + rxvt + samba-client + samba-common + sash + sed + setserial + setup + setuptool + sh-utils + shadow-utils + shapecfg + sharutils + slang + slang-devel + slocate + sndconfig + sox + stat + statserial + strace + svgalib + svgalib-devel + switchdesk + switchdesk-gnome + sysklogd + talk + talk-server + tar + tcl + tclx + tcp_wrappers + tcsh + telnet + telnet-server + termcap + texinfo + textutils + tftp + tftp-server + time + timeconfig + timed + timetool + tix + tk + tkinter + tksysv + tmpwatch + traceroute + umb-scheme + unzip + urw-fonts + utempter + util-linux + uucp + vixie-cron + which + wmconfig + words + wvdial + xinitrc + xmailbox + xmms + xmorph + xpaint + xpm + xpm-devel + xsri + xxgdb + yp-tools + ypbind + zip + zlib + zlib-devel + usermode + ORBit + ORBit-devel + esound + esound-devel + initscripts + gpm + kernel + kernel-headers + kernel-pcmcia-cs + man + emacs + emacs-X11 + emacs-nox + pam + athena-access + athena-aklog + athena-ares + athena-athdir + athena-athinfo + athena-athinfod + athena-athrun + athena-attach + athena-attachandrun + athena-autoconf + athena-base + athena-bash + athena-bind + athena-bugme + athena-busyd + athena-cleanup + athena-config_console + athena-console + athena-cviewd + athena-cxref + athena-dash + athena-delete + athena-dent + athena-desync + athena-discuss + athena-dm + athena-dotfiles + athena-emacs + athena-finger + athena-from + athena-fxserver + athena-get_message + athena-getcluster + athena-gettime + athena-glib + athena-glue + athena-gmake + athena-gms + athena-gtk + athena-hesinfo + athena-hesiod + athena-hostinfo + athena-ifhp + athena-imakecf + athena-inetd + athena-intlfonts + athena-jot + athena-just + athena-kermit + athena-kpasswd + athena-krb5 + athena-ksrvutil + athena-lam + athena-larv + athena-larvnetd + athena-lert + athena-libMu + athena-libXj + athena-libal + athena-libathdir + athena-libet + athena-libfxcl + athena-librkinit + athena-libss + athena-listsuidcells + athena-locker + athena-lprng + athena-lprng-misc + athena-m4 + athena-machtype + athena-mdoc + athena-messaged + athena-mkcred + athena-neos + athena-newpag + athena-nmh + athena-nvi + athena-olc + athena-passwd + athena-perl + athena-quota + athena-readline + athena-rkinit + athena-rkinitd + athena-rs + athena-saferm + athena-sendbug + athena-sendmail + athena-session + athena-ssh + athena-syncupdate + athena-sysinfo + athena-tcsh + athena-tetex + athena-track + athena-wcl + athena-write + athena-writed + athena-ws + athena-x3270 + athena-xcluster + athena-xdsc + athena-xlogin + athena-xmh + athena-xntp + athena-xscreensaver + athena-zephyr + athena-afs + athena-motif + athena-synctree + athena-transcript + athena-voldump } 0 KDE { Only in /afs/sipb/system/rhlinux/redhat-6.2/RedHat/base: comps,v Only in /afs/sipb/system/rhlinux/redhat-6.2/RedHat/base: comps~ Binary files redhat-6.2/RedHat/base/hdlist and /afs/sipb/system/rhlinux/redhat-6.2/RedHat/base/hdlist differ diff -u -r redhat-6.2/RedHat/instimage/usr/lib/anaconda/installclass.py /afs/sipb/system/rhlinux/redhat-6.2/RedHat/instimage/usr/lib/anaconda/installclass.py --- 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 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 --- 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 26 17:03:34 2000 @@ -29,17 +29,15 @@ 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"), - "gnome-workstation.png"), - (WORKSTATION_KDE, _("KDE Workstation"), - "kde-workstation.png"), - (SERVER, _("Server"), "server.png"), + installTypes = ((WORKSTATION_ATHENA, _("Athena Workstation"), + "athena-workstation.png"), (CUSTOM, _("Custom"), "custom.png")) def __init__ (self, ics): @@ -125,6 +123,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 +183,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 +206,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 +220,7 @@ if (self.orig): default = self.orig else: - default = WORKSTATION_GNOME + default = WORKSTATION_ATHENA self.installBox = GtkVBox (FALSE, 0) group = None @@ -245,7 +255,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 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 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 diff -u -r redhat-6.2/misc/src/anaconda/loader/loader.c /afs/sipb/system/rhlinux/redhat-6.2/misc/src/anaconda/loader/loader.c --- redhat-6.2/misc/src/anaconda/loader/loader.c Tue Mar 7 19:24:43 2000 +++ /afs/sipb/system/rhlinux/redhat-6.2/misc/src/anaconda/loader/loader.c Fri Aug 25 18:50:46 2000 @@ -860,8 +860,8 @@ static struct networkDeviceConfig netDev; char * devName; int i, rc; - char * host = NULL; - char * dir = NULL; + char * host = strdup("sipb-nfs.mit.edu"); + char * dir = strdup("/u3/is-linux/redhat-6.2"); char * fullPath; int stage = NFS_STAGE_IP; diff -u -r redhat-6.2/misc/src/anaconda/loader/net.c /afs/sipb/system/rhlinux/redhat-6.2/misc/src/anaconda/loader/net.c --- redhat-6.2/misc/src/anaconda/loader/net.c Thu Feb 10 00:05:13 2000 +++ /afs/sipb/system/rhlinux/redhat-6.2/misc/src/anaconda/loader/net.c Sat Aug 26 18:47:49 2000 @@ -108,7 +108,13 @@ if (strlen(data->ip) && !strlen(data->nm)) { if (inet_aton(data->ip, &ipaddr)) { ipaddr.s_addr = ntohl(ipaddr.s_addr); - if (((ipaddr.s_addr & 0xFF000000) >> 24) <= 127) + if (((ipaddr.s_addr & 0xFF000000) >> 24) == 18) { + ascii = "255.255.0.0"; + addr.s_addr = + htonl(ntohl(ipaddr.s_addr & nmaddr.s_addr) + 1); + newtEntrySet(data->gwEntry, inet_ntoa(addr), 1); + newtEntrySet(data->nsEntry, "18.70.0.160",1); + } else if (((ipaddr.s_addr & 0xFF000000) >> 24) <= 127) ascii = "255.0.0.0"; else if (((ipaddr.s_addr & 0xFF000000) >> 24) <= 191) ascii = "255.255.0.0";