From 1ff9b2377b7af1cf1070daeabf8d060c8903cc80 Mon Sep 17 00:00:00 2001
From: Chris Lumens <clumens@redhat.com>
Date: Mon, 31 Oct 2011 10:55:14 -0400
Subject: [PATCH] Add console fonts to the runtime.

We need these around for systemd to load.
---
 share/runtime-cleanup.tmpl     | 5 ++++-
 share/runtime-postinstall.tmpl | 4 ----
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/share/runtime-cleanup.tmpl b/share/runtime-cleanup.tmpl
index e0efbc64..e7d44b85 100644
--- a/share/runtime-cleanup.tmpl
+++ b/share/runtime-cleanup.tmpl
@@ -47,7 +47,7 @@ remove /etc/logrotate.d
 ## various other things we remove to save space
 removepkg avahi-autoipd coreutils-libs curl dash db4-utils diffutils file
 removepkg fipscheck genisoimage gnome-python2 info iptables isomd5sum
-removepkg jasper-libs kbd-misc libIDL libXt libXxf86misc libXxf86vm
+removepkg jasper-libs libIDL libXt libXxf86misc libXxf86vm
 removepkg libasyncns libcroco libdaemon libevent libhbaapi libhbalinux
 removepkg libmcpp libpcap librsvg2 libtiff libutempter linux-atm-libs
 removepkg lvm2-libs m4 mailx makebootfat mcpp
@@ -227,6 +227,9 @@ removefrom iscsi-initiator-utils /etc/rc.d/*
 removefrom jfsutils /sbin/jfs_fsck /sbin/jfs_fscklog /sbin/jfs_logdump
 removefrom jfsutils /sbin/jfs_mkfs
 removefrom kbd /bin/* /usr/share/locale/*
+removefrom kbd-misc /lib/kbd/consoletrans/*
+removefrom kbd-misc /lib/kbd/keymaps/*
+removefrom kbd-misc /lib/kbd/unimaps/*
 removefrom krb5-libs /etc/* /${libdir}/libgssrpc* /usr/${libdir}/*
 removefrom less /etc/*
 removefrom libX11-common /usr/share/X11/XErrorDB
diff --git a/share/runtime-postinstall.tmpl b/share/runtime-postinstall.tmpl
index c630bae9..f5d0ae24 100644
--- a/share/runtime-postinstall.tmpl
+++ b/share/runtime-postinstall.tmpl
@@ -6,7 +6,6 @@
 # TODO: fix filenames in anaconda so we can drop the ppc64 workaround
 filearch = 'ppc' if basearch == 'ppc64' else basearch
 KEYMAP_OVERRIDE = "usr/share/anaconda/keymaps-override-%s" % filearch
-SCREENFONT = "usr/share/anaconda/screenfont-%s.gz" % filearch
 PYTHONDIR = glob("usr/"+libdir+"/python?.?")[0]
 stubs = ("list-harddrives", "loadkeys", "raidstart", "raidstop")
 configdir = configdir + "/common"
@@ -21,9 +20,6 @@ configdir = configdir + "/common"
     %endif
 %endif
 
-## create_screenfont()
--move ${SCREENFONT} etc/screenfont.gz
-
 ## move_stubs()
 move usr/share/anaconda/restart-anaconda usr/bin
 move ${PYTHONDIR}/site-packages/pyanaconda/sitecustomize.py ${PYTHONDIR}/site-packages