From f51356b4628822a58ddecd217b0e5e079e39499e Mon Sep 17 00:00:00 2001 From: Tom Gundersen Date: Tue, 25 Sep 2012 22:22:05 +0200 Subject: vconsole: default to the kernel compiled-in font No longer override the default kernel font if nothing is specified in vconsole.conf. The default kernel font[0] provides ISO-8859-1 and box characters. Users of Arabic, Cyrilic or Hebrew must set a different font manually as these character sets were provided by the old default font [1], but are not any longer. Rationale: * it is counter-intuitive that an empty vconsole.conf file is different from adding FONT=""; * the version of the default font shipped with Arch (which is the upstream one) behaves very badly during early boot[2] (which should admittedly be fixed in the font itself); * the kernel already supplies a default font, it seems reasonable to use that unless anything else is specified; * This also avoids a needless slow call to setfont; and * We don't want to work around problems in the kernel (in case the compiled-in font is not acceptable for whatever reason). [0]: [1]: [2]: --- src/vconsole/vconsole-setup.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'src/vconsole/vconsole-setup.c') diff --git a/src/vconsole/vconsole-setup.c b/src/vconsole/vconsole-setup.c index 62d9c8d7b..1227b041d 100644 --- a/src/vconsole/vconsole-setup.c +++ b/src/vconsole/vconsole-setup.c @@ -215,10 +215,9 @@ int main(int argc, char **argv) { utf8 = is_locale_utf8(); vc_keymap = strdup("us"); - vc_font = strdup(DEFAULT_FONT); - if (!vc_keymap || !vc_font) { - log_error("Failed to allocate strings."); + if (!vc_keymap) { + log_error("Failed to allocate string."); goto finish; } -- cgit v1.2.3