diff options
| author | Tom Gundersen <teg@jklm.no> | 2012-09-25 22:22:05 +0200 |
|---|---|---|
| committer | Kay Sievers <kay@vrfy.org> | 2012-10-03 15:42:19 +0200 |
| commit | f51356b4628822a58ddecd217b0e5e079e39499e (patch) | |
| tree | 71710d76e955e9c0e544a24f2c718b0424605e03 | |
| parent | ffc227c9568eb0a12dc750761d1e5d68ea125aad (diff) | |
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]: <https://dev.archlinux.org/~tomegun/kernel.bdf>
[1]: <https://dev.archlinux.org/~tomegun/latarcyrheb.bdf>
[2]: <http://i.imgur.com/J2tM4.jpg>
| -rw-r--r-- | Makefile.am | 21 | ||||
| -rw-r--r-- | man/vconsole.conf.xml | 4 | ||||
| -rw-r--r-- | src/vconsole/vconsole-setup.c | 5 |
3 files changed, 10 insertions, 20 deletions
diff --git a/Makefile.am b/Makefile.am index 6836851921..acc8f87701 100644 --- a/Makefile.am +++ b/Makefile.am @@ -160,43 +160,36 @@ AM_LDFLAGS = $(OUR_LDFLAGS) if TARGET_GENTOO AM_CPPFLAGS += \ -DKBD_LOADKEYS=\"/usr/bin/loadkeys\" \ - -DKBD_SETFONT=\"/usr/bin/setfont\" \ - -DDEFAULT_FONT=\"LatArCyrHeb-16\" + -DKBD_SETFONT=\"/usr/bin/setfont\" else if TARGET_ARCH AM_CPPFLAGS += \ -DKBD_LOADKEYS=\"/usr/bin/loadkeys\" \ - -DKBD_SETFONT=\"/usr/bin/setfont\" \ - -DDEFAULT_FONT=\"LatArCyrHeb-16\" + -DKBD_SETFONT=\"/usr/bin/setfont\" else if TARGET_FRUGALWARE AM_CPPFLAGS += \ -DKBD_LOADKEYS=\"/usr/bin/loadkeys\" \ - -DKBD_SETFONT=\"/usr/bin/setfont\" \ - -DDEFAULT_FONT=\"LatArCyrHeb-16\" + -DKBD_SETFONT=\"/usr/bin/setfont\" else if TARGET_MANDRIVA AM_CPPFLAGS += \ -DKBD_LOADKEYS=\"/bin/loadkeys\" \ - -DKBD_SETFONT=\"/bin/setfont\" \ - -DDEFAULT_FONT=\"LatArCyrHeb-16\" + -DKBD_SETFONT=\"/bin/setfont\" else if TARGET_ANGSTROM AM_CPPFLAGS += \ -DKBD_LOADKEYS=\"/usr/bin/loadkeys\" \ - -DKBD_SETFONT=\"/usr/bin/setfont\" \ - -DDEFAULT_FONT=\"LatArCyrHeb-16\" + -DKBD_SETFONT=\"/usr/bin/setfont\" else if TARGET_MAGEIA AM_CPPFLAGS += \ -DKBD_LOADKEYS=\"/bin/loadkeys\" \ - -DKBD_SETFONT=\"/bin/setfont\" \ - -DDEFAULT_FONT=\"LatArCyrHeb-16\" + -DKBD_SETFONT=\"/bin/setfont\" else AM_CPPFLAGS += \ -DKBD_LOADKEYS=\"/bin/loadkeys\" \ - -DKBD_SETFONT=\"/bin/setfont\" \ - -DDEFAULT_FONT=\"latarcyrheb-sun16\" + -DKBD_SETFONT=\"/bin/setfont\" endif endif endif diff --git a/man/vconsole.conf.xml b/man/vconsole.conf.xml index e23a980232..258c82bc62 100644 --- a/man/vconsole.conf.xml +++ b/man/vconsole.conf.xml @@ -112,9 +112,7 @@ <listitem><para>Configures the console font, the console map and the unicode - font map. <varname>FONT=</varname> - defaults to - <literal>latarcyrheb-sun16</literal>.</para></listitem> + font map.</para></listitem> </varlistentry> </variablelist> diff --git a/src/vconsole/vconsole-setup.c b/src/vconsole/vconsole-setup.c index 62d9c8d7b5..1227b041d3 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; } |