]> git.ipfire.org Git - thirdparty/systemd.git/commitdiff
vconsole: remove Frugalware legacy file support
authorMiklos Vajna <vmiklos@frugalware.org>
Sat, 3 Nov 2012 15:23:00 +0000 (16:23 +0100)
committerKay Sievers <kay@vrfy.org>
Sat, 3 Nov 2012 20:23:37 +0000 (21:23 +0100)
src/vconsole/vconsole-setup.c

index cb7ade0d245bbc1a020125c3fbed265610c18755..4319e28fae73a212155add8b64614d5e023ac4cd 100644 (file)
@@ -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,