aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rwxr-xr-xrc.d/rc.sysinit2
-rw-r--r--src/console_init.c12
2 files changed, 7 insertions, 7 deletions
diff --git a/rc.d/rc.sysinit b/rc.d/rc.sysinit
index 4f4fc6d9..832bcc2a 100755
--- a/rc.d/rc.sysinit
+++ b/rc.d/rc.sysinit
@@ -664,7 +664,7 @@ fi
if [ "$READONLY" != "yes" ] ; then
action $"Mounting local filesystems: " mount -a -t nonfs,nfs4,smbfs,ncpfs,cifs,gfs,gfs2 -O no_netdev
else
- action $"Mounting local filesystems: " mount -a -n -t nfs4,smbfs,ncpfs,cifs,gfs,gfs2 -O no_netdev
+ action $"Mounting local filesystems: " mount -a -n -t nonfs,nfs4,smbfs,ncpfs,cifs,gfs,gfs2 -O no_netdev
fi
# Update quotas if necessary
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);