From: Miklos Vajna <vmiklos@frugalware.org>
Date: Sat, 3 Nov 2012 15:23:00 +0000 (+0100)
Subject: vconsole: remove Frugalware legacy file support
X-Git-Tag: v196~145
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=commitdiff_plain;h=da974c2ff296f86dc144f872d6d799fbc0c380e7

vconsole: remove Frugalware legacy file support
---

diff --git a/src/vconsole/vconsole-setup.c b/src/vconsole/vconsole-setup.c
index cb7ade0d2..4319e28fa 100644
--- a/src/vconsole/vconsole-setup.c
+++ b/src/vconsole/vconsole-setup.c
@@ -254,19 +254,6 @@ int main(int argc, char **argv) {
                 if (r < 0 && r != -ENOENT)
                         log_warning("Failed to read /etc/rc.conf: %s", strerror(-r));
 
-#elif defined(TARGET_FRUGALWARE)
-                r = parse_env_file("/etc/sysconfig/keymap", NEWLINE,
-                                   "keymap", &vc_keymap,
-                                   NULL);
-                if (r < 0 && r != -ENOENT)
-                        log_warning("Failed to read /etc/sysconfig/keymap: %s", strerror(-r));
-
-                r = parse_env_file("/etc/sysconfig/font", NEWLINE,
-                                   "font", &vc_font,
-                                   NULL);
-                if (r < 0 && r != -ENOENT)
-                        log_warning("Failed to read /etc/sysconfig/font: %s", strerror(-r));
-
 #elif defined(TARGET_ALTLINUX)
                 r = parse_env_file("/etc/sysconfig/keyboard", NEWLINE,
                                    "KEYTABLE", &vc_keymap,