diff options
| author | Jeremy Katz <katzj@redhat.com> | 2005-11-16 19:12:26 +0000 |
|---|---|---|
| committer | Jeremy Katz <katzj@redhat.com> | 2005-11-16 19:12:26 +0000 |
| commit | bb4f7a2497272f5b34a2c7b3c4755bf7a367e601 (patch) | |
| tree | 8f8f6448323f754610fa314f0f3d2edb7a5dd930 /scripts | |
| parent | 9dfd59b68f34e2f8fc14a1a6927a523fb3da3f09 (diff) | |
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')
| -rwxr-xr-x | scripts/mk-images | 2 | ||||
| -rwxr-xr-x | scripts/upd-instroot | 9 |
2 files changed, 3 insertions, 8 deletions
diff --git a/scripts/mk-images b/scripts/mk-images index edd4f8fb3..2037606c1 100755 --- a/scripts/mk-images +++ b/scripts/mk-images @@ -644,6 +644,8 @@ EOF ln -s /sbin/init $MBD_DIR/init ln -s /proc/mounts $MBD_DIR/etc/mtab ln -s sbin $MBD_DIR/bin + mkdir -p $MBD_DIR/var/lib + ln -s ../../tmp $MBD_DIR/var/lib/xkb # s390/s390x need sshd/telnet setup if [ "$BUILDARCH" = "s390" -o "$BUILDARCH" = "s390x" ]; then 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 |