From 7f102d17b56f7697c963462eb422df2077ce919c Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Mon, 6 Oct 2008 14:53:02 -0400 Subject: Fix setting of console font/map (#458362, ) Don't explicitly pass -u none or -m none; just pass them if one is set. --- src/console_init.c | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) (limited to 'src/console_init.c') diff --git a/src/console_init.c b/src/console_init.c index a41ec643..a3d93791 100644 --- a/src/console_init.c +++ b/src/console_init.c @@ -90,18 +90,23 @@ static void set_font(char *device) { int pid, status; if ( (pid = fork()) == 0) { - char *args[] = { "setfont", "latarcyrheb-sun16", "-m", "none", - "-u", "none", "-C", NULL, NULL }; + char *args[] = { "setfont", "latarcyrheb-sun16", "-C", NULL, + NULL, NULL, NULL, NULL, NULL }; if (font) args[1] = font; + args[3] = device; if (acm) { - args[3] = acm; - } - if (unimap) { + args[4] = "-m"; + args[5] = acm; + if (unimap) { + args[6] = "-u"; + args[7] = unimap; + } + } else if (unimap) { + args[4] = "-u"; args[5] = unimap; } - args[7] = device; execv("/bin/setfont", args); exit(1); } -- cgit v1.2.1