summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2011-09-28 04:25:20 +0200
committerLennart Poettering <lennart@poettering.net>2011-09-28 04:34:17 +0200
commite99fa3cba5c0a07bdcea22a308bf9b973e88b624 (patch)
tree02338efc95bc853ca2a1db0f4d6a8aa1a56af903
parentfb9de93dd3587e62e0fc0413673c98ea709c5a2f (diff)
vconsole: don't parse Fedora's KEYMAP= kernel parameters anymore
KEYMAP are use to pass keymap configuration to initrd, but not to the system itself. Since the initrd might get out of date we need to make sure that changes made in userspace override the settings from the cmdline, hence drpo any use of it all for these variables.
-rw-r--r--src/vconsole-setup.c4
1 files changed, 0 insertions, 4 deletions
diff --git a/src/vconsole-setup.c b/src/vconsole-setup.c
index 8a89358a2d..c5f3628c9b 100644
--- a/src/vconsole-setup.c
+++ b/src/vconsole-setup.c
@@ -203,10 +203,6 @@ int main(int argc, char **argv) {
if (detect_container(NULL) <= 0)
if ((r = parse_env_file("/proc/cmdline", WHITESPACE,
-#if defined(TARGET_FEDORA) || defined(TARGET_MEEGO)
- "SYSFONT", &vc_font,
- "KEYTABLE", &vc_keymap,
-#endif
"vconsole.keymap", &vc_keymap,
"vconsole.keymap.toggle", &vc_keymap_toggle,
"vconsole.font", &vc_font,