From: Lennart Poettering <lennart@poettering.net>
Date: Fri, 17 Sep 2010 23:20:13 +0000 (+0200)
Subject: vconsole: drop vconsole config file var prefix
X-Git-Tag: v11~129
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=commitdiff_plain;h=a18fb4823b70b90f2d86297cd2d3f04aea03c38f;ds=sidebyside

vconsole: drop vconsole config file var prefix
---

diff --git a/src/vconsole-setup.c b/src/vconsole-setup.c
index 1412b2094..0f730a0e7 100644
--- a/src/vconsole-setup.c
+++ b/src/vconsole-setup.c
@@ -204,10 +204,10 @@ int main(int argc, char **argv) {
         /* Override distribution-specific options with the
          * distribution-independent configuration */
         if ((r = parse_env_file("/etc/vconsole", NEWLINE,
-                                "VCONSOLE_KEYMAP", &vc_keymap,
-                                "VCONSOLE_FONT", &vc_font,
-                                "VCONSOLE_FONT_MAP", &vc_font_map,
-                                "VCONSOLE_FONT_UNIMAP", &vc_font_unimap,
+                                "KEYMAP", &vc_keymap,
+                                "FONT", &vc_font,
+                                "FONT_MAP", &vc_font_map,
+                                "FONT_UNIMAP", &vc_font_unimap,
                                 NULL)) < 0) {
 
                 if (r != -ENOENT)