From: Tom Gundersen <teg@jklm.no>
Date: Wed, 3 Oct 2012 13:57:40 +0000 (+0200)
Subject:     vconsole: default to the kernel compiled-in keymap
X-Git-Tag: v194~8
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=commitdiff_plain;h=8d789b905dba8aebd30238520b6ad52fb866af95;hp=f51356b4628822a58ddecd217b0e5e079e39499e

vconsole: default to the kernel compiled-in keymap

    No longer override the default kernel keymap if nothing is specified in
    vconsole.conf.

    The default should be to do nothing (i.e., use what is already in the
    kernel) unless the distro/admin has explicitly requested it.
---

diff --git a/src/vconsole/vconsole-setup.c b/src/vconsole/vconsole-setup.c
index 1227b041d..a652ec2b1 100644
--- a/src/vconsole/vconsole-setup.c
+++ b/src/vconsole/vconsole-setup.c
@@ -214,13 +214,6 @@ int main(int argc, char **argv) {
 
         utf8 = is_locale_utf8();
 
-        vc_keymap = strdup("us");
-
-        if (!vc_keymap) {
-                log_error("Failed to allocate string.");
-                goto finish;
-        }
-
         r = 0;
 
         if (detect_container(NULL) <= 0) {