From 3a0b0595776b517c3697ba1befd248852676d662 Mon Sep 17 00:00:00 2001 From: Will Woods Date: Tue, 14 Feb 2012 16:55:51 -0500 Subject: [PATCH] runtime-postinstall: remove keymap stuff anaconda no longer contains the keymap overrides and systemd should be handling keymap stuff for us, so this isn't necessary. --- share/runtime-postinstall.tmpl | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/share/runtime-postinstall.tmpl b/share/runtime-postinstall.tmpl index 8cf53229..ca4301a3 100644 --- a/share/runtime-postinstall.tmpl +++ b/share/runtime-postinstall.tmpl @@ -3,23 +3,11 @@ <%page args="root, basearch, libdir, configdir"/> <% -# TODO: make systemd handle the keymaps and drop this from lorax/anaconda -filearch = 'ppc' if basearch == 'ppc64' else basearch -KEYMAP_OVERRIDE = "usr/share/anaconda/keymaps-override-%s" % filearch PYTHONDIR = glob("usr/"+libdir+"/python?.?")[0] stubs = ("list-harddrives", "loadkeys", "raidstart", "raidstop") configdir = configdir + "/common" %> -## create_keymaps() -%if basearch not in ("s390", "s390x"): - %if exists(KEYMAP_OVERRIDE): - move ${KEYMAP_OVERRIDE} etc/keymaps.gz - %else: - runcmd ${root}/usr/libexec/anaconda/getkeymaps ${basearch} ${root}/etc/keymaps.gz ${root} - %endif -%endif - ## move_stubs() move usr/share/anaconda/restart-anaconda usr/bin move ${PYTHONDIR}/site-packages/pyanaconda/sitecustomize.py ${PYTHONDIR}/site-packages