From: Lennart Poettering <lennart@poettering.net>
Date: Wed, 28 Sep 2011 02:25:20 +0000 (+0200)
Subject: vconsole: don't parse Fedora's KEYMAP= kernel parameters anymore
X-Git-Tag: v37~34
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=commitdiff_plain;h=e99fa3cba5c0a07bdcea22a308bf9b973e88b624

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.
---

diff --git a/src/vconsole-setup.c b/src/vconsole-setup.c
index 8a89358a2..c5f3628c9 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,