aboutsummaryrefslogtreecommitdiffstats
path: root/src/console_init.c
diff options
context:
space:
mode:
authorBill Nottingham <notting@redhat.com>2009-02-26 11:17:48 -0500
committerBill Nottingham <notting@redhat.com>2009-02-26 11:17:48 -0500
commitdffab47bedc9fb5dff33d4d63b70ad54db40a0e2 (patch)
tree0e5d658ff0c03700306bb3acc23cb9085eb2f4ab /src/console_init.c
parentce4d036fcaebe759bd5edc2026c34bae5d8bf853 (diff)
downloadinitscripts-dffab47bedc9fb5dff33d4d63b70ad54db40a0e2.tar
initscripts-dffab47bedc9fb5dff33d4d63b70ad54db40a0e2.tar.gz
initscripts-dffab47bedc9fb5dff33d4d63b70ad54db40a0e2.tar.bz2
initscripts-dffab47bedc9fb5dff33d4d63b70ad54db40a0e2.tar.xz
initscripts-dffab47bedc9fb5dff33d4d63b70ad54db40a0e2.zip
loadkeys has a -q option for silent running. Use it.
Diffstat (limited to 'src/console_init.c')
-rw-r--r--src/console_init.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/src/console_init.c b/src/console_init.c
index a3d93791..63a248c7 100644
--- a/src/console_init.c
+++ b/src/console_init.c
@@ -87,7 +87,7 @@ static int read_keymap() {
}
static void set_font(char *device) {
- int pid, status;
+ int pid;
if ( (pid = fork()) == 0) {
char *args[] = { "setfont", "latarcyrheb-sun16", "-C", NULL,
@@ -125,18 +125,18 @@ static void set_terminal(int fd, int utf8) {
}
static void set_keymap(int fd, int utf8) {
- int pid, status;
+ int pid;
if ((pid = fork()) == 0) {
- char *args[] = { "loadkeys", NULL, NULL, NULL };
+ char *args[] = { "loadkeys", "-q", NULL, NULL, NULL };
dup2(fd, 0);
dup2(fd, 1);
if (utf8) {
- args[1] = "-u";
- args[2] = keymap;
+ args[2] = "-u";
+ args[3] = keymap;
} else {
- args[1] = keymap;
+ args[2] = keymap;
}
execv("/bin/loadkeys", args);
exit(1);