chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
f51356b
)
vconsole: default to the kernel compiled-in keymap
author
Tom Gundersen
<teg@jklm.no>
Wed, 3 Oct 2012 13:57:40 +0000
(15:57 +0200)
committer
Kay Sievers
<kay@vrfy.org>
Wed, 3 Oct 2012 13:57:40 +0000
(15:57 +0200)
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.
src/vconsole/vconsole-setup.c
patch
|
blob
|
history
diff --git
a/src/vconsole/vconsole-setup.c
b/src/vconsole/vconsole-setup.c
index 1227b041d339c785cd32b6708354a364c02434dd..a652ec2b1a1b5b92061ef001c4ef21b4834f5736 100644
(file)
--- 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) {