diff options
| author | Bill Nottingham <notting@redhat.com> | 2008-10-06 14:53:02 -0400 |
|---|---|---|
| committer | Bill Nottingham <notting@redhat.com> | 2008-10-06 14:53:02 -0400 |
| commit | 7f102d17b56f7697c963462eb422df2077ce919c (patch) | |
| tree | 00bb98a447b5a84ca052f2ac18780b6ac88421f5 | |
| parent | 8c4fa688931a8e915b0b870290483f352d05c828 (diff) | |
| download | initscripts-7f102d17b56f7697c963462eb422df2077ce919c.tar initscripts-7f102d17b56f7697c963462eb422df2077ce919c.tar.gz initscripts-7f102d17b56f7697c963462eb422df2077ce919c.tar.bz2 initscripts-7f102d17b56f7697c963462eb422df2077ce919c.tar.xz initscripts-7f102d17b56f7697c963462eb422df2077ce919c.zip | |
Fix setting of console font/map (#458362, <ak@sensi.org>)
Don't explicitly pass -u none or -m none; just pass them if one is set.
| -rw-r--r-- | src/console_init.c | 17 |
1 files changed, 11 insertions, 6 deletions
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); } |