diff options
| author | Lennart Poettering <lennart@poettering.net> | 2010-09-21 03:16:28 +0200 |
|---|---|---|
| committer | Lennart Poettering <lennart@poettering.net> | 2010-09-21 03:16:28 +0200 |
| commit | 653ab83b1828101d4321ddab49c0b09b7d8ed422 (patch) | |
| tree | 53f47c6e3885ee9bc2bc0048eecf3e04f4188ca1 /src/locale-setup.c | |
| parent | ce8a6aa1a0934d7377b8c7af185149e4627512b6 (diff) | |
vconsole: make sure we don't merge configuration settings from different sources
Diffstat (limited to 'src/locale-setup.c')
| -rw-r--r-- | src/locale-setup.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/locale-setup.c b/src/locale-setup.c index cf0d3e556f..d2e1b50085 100644 --- a/src/locale-setup.c +++ b/src/locale-setup.c @@ -94,7 +94,6 @@ int locale_setup(void) { /* Hmm, nothing set on the kernel cmd line? Then let's * try /etc/locale */ - if (r <= 0 && (r = parse_env_file("/etc/locale", NEWLINE, "LANG", &variables[VARIABLE_LANG], @@ -125,6 +124,7 @@ int locale_setup(void) { if (r != -ENOENT) log_warning("Failed to read /etc/sysconfig/i18n: %s", strerror(-r)); } + #elif defined(TARGET_ARCH) if (r <= 0 && (r = parse_env_file("/etc/rc.conf", NEWLINE, @@ -134,6 +134,7 @@ int locale_setup(void) { 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 |