From fbf27f4592f76cb9509a6c960444bb5b3436aeef Mon Sep 17 00:00:00 2001
From: Colin Guthrie <colin@mageia.org>
Date: Sun, 8 Feb 2015 16:33:10 +0000
Subject: i18n: Write the desired console font to /etc/vconsole.conf

---
 perl-install/NEWS    |  1 +
 perl-install/lang.pm | 11 +++++++++--
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/perl-install/NEWS b/perl-install/NEWS
index 79c5e0cbe..387de0015 100644
--- a/perl-install/NEWS
+++ b/perl-install/NEWS
@@ -1,3 +1,4 @@
+- i18n: Write the desired console font to /etc/vconsole.conf
 - i18n: Use the x-distro /etc/locale.conf file instead of /etc/sysconfig/i18n
 - drakedm: Do not use ancient dm init script to restart DM
 
diff --git a/perl-install/lang.pm b/perl-install/lang.pm
index 702a43d32..96819d1e7 100644
--- a/perl-install/lang.pm
+++ b/perl-install/lang.pm
@@ -1467,8 +1467,15 @@ sub write {
         # Only include valid fields and ommit any that are the same as LANG to make it cleaner
         # (cleanup logic copied from systemd)
         my @filtered_keys = grep { exists $h->{$_} && ($_ eq 'LANG' || !exists $h->{'LANG'} || $h->{$_} ne $h->{'LANG'}) } @locale_conf_fields;
-        my $filtered = { map { $_ => $h->{$_} } @filtered_keys };
-        setVarsInShMode($::prefix . $file, 0644, $filtered);
+        my $h2 = { map { $_ => $h->{$_} } @filtered_keys };
+        setVarsInShMode($::prefix . $file, 0644, $h2);
+
+        if ($h->{'SYSFONT'}) {
+             $file = '/etc/vconsole.conf';
+             $h2 = { 'FONT' => $h->{'SYSFONT'} };
+             $h2->{'FONT_UNIMAP'} = $h->{'SYSFONTACM'} if ($h->{'SYSFONTACM'});
+             addVarsInShMode($::prefix . $file, 0644, $h2);
+        }
     }
 
     run_program::rooted($::prefix, 'grub-gfxmenu', '--quiet', '--lang', $locale->{lang}) if !$b_user_only;
-- 
cgit v1.2.1