summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTom Gundersen <teg@jklm.no>2012-10-03 15:57:40 +0200
committerKay Sievers <kay@vrfy.org>2012-10-03 15:57:40 +0200
commit8d789b905dba8aebd30238520b6ad52fb866af95 (patch)
tree3ca27dfcbf6b5468f2ea5af03f986a54c567d7fa
parentvconsole: default to the kernel compiled-in font (diff)
downloadsystemd-8d789b905dba8aebd30238520b6ad52fb866af95.tar.gz
systemd-8d789b905dba8aebd30238520b6ad52fb866af95.tar.bz2
systemd-8d789b905dba8aebd30238520b6ad52fb866af95.zip
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.
-rw-r--r--src/vconsole/vconsole-setup.c7
1 files changed, 0 insertions, 7 deletions
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) {