chiark / gitweb /
drop Arch Linux support for reading /etc/rc.conf
authorDave Reisner <dreisner@archlinux.org>
Sat, 3 Nov 2012 23:59:42 +0000 (19:59 -0400)
committerDave Reisner <dreisner@archlinux.org>
Sat, 3 Nov 2012 23:59:42 +0000 (19:59 -0400)
src/core/locale-setup.c
src/vconsole/vconsole-setup.c

index ec51290..b9bd3a0 100644 (file)
@@ -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
index 4319e28..ca20849 100644 (file)
@@ -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,