summaryrefslogtreecommitdiff
authorDave Reisner <dreisner@archlinux.org>2012-11-03 23:59:42 (GMT)
committer Dave Reisner <dreisner@archlinux.org>2012-11-03 23:59:42 (GMT)
commit53d05b44f17db67d644069600e4b5bbca88d21e7 (patch) (side-by-side diff)
tree3e94dce02dad9705e2097c76edd2714a5e228cda
parentbd49c40537ff78060b851b85fd5fdb654f34eaf4 (diff)
downloadsystemd-53d05b44f17db67d644069600e4b5bbca88d21e7.zip
systemd-53d05b44f17db67d644069600e4b5bbca88d21e7.tar.gz
drop Arch Linux support for reading /etc/rc.conf
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--src/core/locale-setup.c10
-rw-r--r--src/vconsole/vconsole-setup.c9
2 files changed, 0 insertions, 19 deletions
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,