summaryrefslogtreecommitdiffstats
path: root/scripts/upd-instroot
diff options
context:
space:
mode:
authorJeremy Katz <katzj@redhat.com>2005-11-16 19:12:26 +0000
committerJeremy Katz <katzj@redhat.com>2005-11-16 19:12:26 +0000
commitbb4f7a2497272f5b34a2c7b3c4755bf7a367e601 (patch)
tree8f8f6448323f754610fa314f0f3d2edb7a5dd930 /scripts/upd-instroot
parent9dfd59b68f34e2f8fc14a1a6927a523fb3da3f09 (diff)
downloadanaconda-bb4f7a2497272f5b34a2c7b3c4755bf7a367e601.tar.gz
anaconda-bb4f7a2497272f5b34a2c7b3c4755bf7a367e601.tar.xz
anaconda-bb4f7a2497272f5b34a2c7b3c4755bf7a367e601.zip
2005-11-16 Jeremy Katz <katzj@redhat.com>
* scripts/mk-images: Add /var/lib/xkb as a symlink to /tmp so we have setxkbmap work. * scripts/upd-instroot: Add xkbcomp.Remove old version of xkb tmp symlinking
Diffstat (limited to 'scripts/upd-instroot')
-rwxr-xr-xscripts/upd-instroot9
1 files changed, 1 insertions, 8 deletions
diff --git a/scripts/upd-instroot b/scripts/upd-instroot
index e13d6b6e8..8aa670378 100755
--- a/scripts/upd-instroot
+++ b/scripts/upd-instroot
@@ -589,6 +589,7 @@ sbin/silo
sbin/tune2fs
usr/bin/Xorg
usr/bin/setxkbmap
+usr/bin/xkbcomp
usr/share/X11/XKeysymDB
usr/share/X11/fonts/misc/6x13*
usr/share/X11/fonts/misc/fonts*
@@ -1291,11 +1292,3 @@ rm -rf $TZDIR
# this is only for the minimal second stage
echo "Cleaning ramdisk install images..."
rm -rf $DEST/usr/lib/anaconda-runtime
-
-if [ "$ARCH" != "s390" -a "$ARCH" != "s390x" ]; then
- if [ $NEEDGR ]; then
- # Xserver needs a place to put the compiled xkb maps.
- rm -rf $DESTGR/usr/X11R6/lib/X11/xkb/compiled
- ln -s /tmp $DESTGR/usr/X11R6/lib/X11/xkb/compiled
- fi
-fi