diff options
| author | Dave Reisner <dreisner@archlinux.org> | 2012-11-04 00:59:42 +0100 |
|---|---|---|
| committer | Dave Reisner <dreisner@archlinux.org> | 2012-11-04 00:59:42 +0100 |
| commit | 53d05b44f17db67d644069600e4b5bbca88d21e7 (patch) | |
| tree | 3e94dce02dad9705e2097c76edd2714a5e228cda /src | |
| parent | bash-completion > shell-completion (diff) | |
| download | systemd-53d05b44f17db67d644069600e4b5bbca88d21e7.tar.xz systemd-53d05b44f17db67d644069600e4b5bbca88d21e7.zip | |
drop Arch Linux support for reading /etc/rc.conf
Diffstat (limited to 'src')
| -rw-r--r-- | src/core/locale-setup.c | 10 | ||||
| -rw-r--r-- | src/vconsole/vconsole-setup.c | 9 |
2 files changed, 0 insertions, 19 deletions
diff --git a/src/core/locale-setup.c b/src/core/locale-setup.c index ec512909ec..b9bd3a0748 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 4319e28fae..ca208497c3 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, |