[systemd-commits] src/core src/vconsole

[Dave Reisner]

 src/core/locale-setup.c       |   10 ----------
 src/vconsole/vconsole-setup.c |    9 ---------
 2 files changed, 19 deletions(-)

New commits:
commit 53d05b44f17db67d644069600e4b5bbca88d21e7
Author: Dave Reisner <dreisner at archlinux.org>
Date:   Sat Nov 3 19:59:42 2012 -0400

    drop Arch Linux support for reading /etc/rc.conf

diff --git a/src/core/locale-setup.c b/src/core/locale-setup.c
index ec51290..b9bd3a0 100644
--- a/src/core/locale-setup.c
+++ b/src/core/locale-setup.c
@@ -163,16 +163,6 @@ int locale_setup(void) {
                         log_warning("Failed to read /etc/default/locale: %s", strerror(-r));
         }
 
-#elif defined(TARGET_ARCH)
-        if (r <= 0 &&
-            (r = parse_env_file("/etc/rc.conf", NEWLINE,
-                                "LOCALE", &variables[VARIABLE_LANG],
-                                NULL)) < 0) {
-
-                if (r != -ENOENT)
-                        log_warning("Failed to read /etc/rc.conf: %s", strerror(-r));
-        }
-
 #elif defined(TARGET_GENTOO)
         /* Gentoo's openrc expects locale variables in /etc/env.d/
          * These files are later compiled by env-update into shell
diff --git a/src/vconsole/vconsole-setup.c b/src/vconsole/vconsole-setup.c
index 4319e28..ca20849 100644
--- a/src/vconsole/vconsole-setup.c
+++ b/src/vconsole/vconsole-setup.c
@@ -245,15 +245,6 @@ int main(int argc, char **argv) {
                 if (r < 0 && r != -ENOENT)
                         log_warning("Failed to read /etc/sysconfig/console: %s", strerror(-r));
 
-#elif defined(TARGET_ARCH)
-                r = parse_env_file("/etc/rc.conf", NEWLINE,
-                                   "KEYMAP", &vc_keymap,
-                                   "CONSOLEFONT", &vc_font,
-                                   "CONSOLEMAP", &vc_font_map,
-                                   NULL);
-                if (r < 0 && r != -ENOENT)
-                        log_warning("Failed to read /etc/rc.conf: %s", strerror(-r));
-
 #elif defined(TARGET_ALTLINUX)
                 r = parse_env_file("/etc/sysconfig/keyboard", NEWLINE,
                                    "KEYTABLE", &vc_keymap,