From ed95688d4015692ac256a1e8d5dfbad3675e977e Mon Sep 17 00:00:00 2001 From: Will Woods Date: Tue, 2 Aug 2011 11:55:01 -0400 Subject: [PATCH] Add workaround for keymap/screenfont on ppc64 --- share/runtime-postinstall.tmpl | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/share/runtime-postinstall.tmpl b/share/runtime-postinstall.tmpl index 4f702d59..65aed413 100644 --- a/share/runtime-postinstall.tmpl +++ b/share/runtime-postinstall.tmpl @@ -1,7 +1,9 @@ <%page args="root, basearch, libdir, configdir"/> <% -KEYMAP_OVERRIDE = "usr/share/anaconda/keymaps-override-%s" % basearch -SCREENFONT = "usr/share/anaconda/screenfont-%s.gz" % basearch +# 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") %> @@ -16,7 +18,7 @@ stubs = ("list-harddrives", "loadkeys", "raidstart", "raidstop") %endif ## create_screenfont() -moveif usr/share/anaconda/screenfont-${basearch}.gz etc/screenfont.gz +moveif ${SCREENFONT} etc/screenfont.gz ## move_stubs() move usr/share/anaconda/restart-anaconda usr/bin