Keep xinf files on text installs. Also, XFree86 no longer exists.

2 files changed, 12 insertions, 13 deletions

diff --git a/ChangeLog b/ChangeLog
index 7d9a66c65..aefadc814 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -3,6 +3,9 @@
 	* users.py (Users.createUser):  Set the right home directory so it
 	gets made correctly (#216681).
 
+	* scripts/upd-instroot:  Keep xinf files on text installs.  Also,
+	XFree86 no longer exists.
+
 2006-11-21  Chris Lumens  <clumens@redhat.com>
 
 	* anaconda.spec:  Bump version.
diff --git a/scripts/upd-instroot b/scripts/upd-instroot
index 6ee86eb2a..c2976acba 100755
--- a/scripts/upd-instroot
+++ b/scripts/upd-instroot
@@ -110,7 +110,7 @@ mkdir -p $DESTGR
 
 PACKAGES="glibc glibc-common setup openssl python newt slang libselinux
 	 libsepol libtermcap zlib ash e2fsprogs util-linux raidtools popt
-	 procps rpm rpm-libs XFree86 Xconfigurator anaconda tzdata
+	 procps rpm rpm-libs Xconfigurator anaconda tzdata
 	 anaconda-runtime kudzu hwdata bzip2 beecrypt mdadm libsemanage
 	 bzip2-libs dosfstools pciutils reiserfs-utils parted sed
 	 busybox-anaconda rpm-python booty hdparm lvm2 beecrypt device-mapper
@@ -136,9 +136,9 @@ fi
 if [ $ARCH = s390 -o $ARCH = s390x ]; then
     PACKAGES="$PACKAGES s390utils binutils libgcc tcp_wrappers
               sed net-tools xinetd openssl openssh openssh-server coreutils
-              login initscripts XFree86-xauth bash portmap pam 
+              login initscripts bash portmap pam 
               telnet-server login mount grep modutils gawk
-              XFree86-libs strace xorg-x11-xauth xorg-x11-libs"
+              strace xorg-x11-xauth xorg-x11-libs"
 fi
 
 if [ $ARCH = ppc -o $ARCH = ppc64 ]; then
@@ -153,23 +153,18 @@ fi
 # 
 # Extra stuff we want for rescue mode should go in PACKAGESRESCUE
 #
-PACKAGESGR="anaconda XFree86-libs libpng XFree86-75dpi-fonts
-           XFree86-ISO8859-2-75dpi-fonts gtk2 libglade2
-           XFree86-ISO8859-9-75dpi-fonts  
-           XFree86-100dpi-fonts fonts-ISO8859-2 fonts-ISO8859-9
-           XFree86-xfs e2fsprogs coreutils glibc glibc-common
+PACKAGESGR="anaconda libpng gtk2 libglade2 fonts-ISO8859-2 fonts-ISO8859-9
+           e2fsprogs coreutils glibc glibc-common
            popt specspo util-linux rpm rpm-libs tzdata
            procps bash cpio gpm pygtk2-libglade pygobject2
-           XFree86 Xconfigurator pygtk2 gdk-pixbuf 
-           XFree86-KOI8-R XFree86-KOI8-R-75dpi-fonts libpixman
+           Xconfigurator pygtk2 gdk-pixbuf libpixman
            reiserfs-utils atk pango freetype gnome-python2-canvas cairo
            libgnomecanvas libart_lgpl libgcc libacl libattr libstdc++ expat
-           anaconda-images anaconda-help XFree86-base-fonts
-           ttfonts-ko taipeifonts XFree86-ISO8859-15-75dpi-fonts rhpl
+           anaconda-images anaconda-help ttfonts-ko taipeifonts rhpl
            system-config-keyboard Xft fontconfig gtk2-engines gnome-themes
            gtkhtml2 gnome-python2-gtkhtml2 gail
            ttfonts-ja ttfonts-zh_TW bitmap-fonts-cjk urw-fonts fonts-arabic
-           comps-extras XFree86-libs-data convertdb1 fonts-bengali
+           comps-extras convertdb1 fonts-bengali
            vnc-server libjpeg tcp_wrappers system-config-date
            xfsprogs xfsdump dmapi attr acl policy policycoreutils
            selinux-policy-targeted ttfonts-zh_CN redhat-artwork
@@ -242,6 +237,7 @@ XORGDRIVERS="xorg-x11-drv-acecad xorg-x11-drv-aiptek xorg-x11-drv-apm xorg-x11-d
 XORGFONTS="xorg-x11-fonts-75dpi xorg-x11-fonts-base xorg-x11-fonts-cyrillic xorg-x11-fonts-ISO8859-15-75dpi xorg-x11-fonts-ISO8859-1-75dpi xorg-x11-fonts-ISO8859-2-75dpi xorg-x11-fonts-ISO8859-9-75dpi xorg-x11-fonts-misc xorg-x11-fonts-ethiopic"
 XORG="$XORGLIBS $XORGDRIVERS $XORGFONTS xorg-x11-server-Xorg xorg-x11-xauth xorg-x11-font-utils xorg-x11-xkb-utils xorg-x11-xkbdata xorg-x11-server-utils xkeyboard-config"
 
+PACKAGES="$PACKAGES $XORGDRIVERS"
 PACKAGESGR="$PACKAGESGR $XORG"