X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Fcore%2Flocale-setup.c;fp=src%2Fcore%2Flocale-setup.c;h=25eb13474a3fecb482fe532251773a84f9cf2c7a;hb=8401e9f91d65c3d8d49cf0d2e35d03146354e957;hp=aab454e83b1042f5b62f09a0ec960f96d3b9e4c2;hpb=6aae0ed2d5915c28b27857fe0cf16e01b21a1882;p=elogind.git diff --git a/src/core/locale-setup.c b/src/core/locale-setup.c index aab454e83..25eb13474 100644 --- a/src/core/locale-setup.c +++ b/src/core/locale-setup.c @@ -74,7 +74,7 @@ int locale_setup(void) { if (detect_container(NULL) <= 0) if ((r = parse_env_file("/proc/cmdline", WHITESPACE, -#if defined(TARGET_FEDORA) || defined(TARGET_MEEGO) +#if defined(TARGET_FEDORA) "LANG", &variables[VARIABLE_LANG], #endif "locale.LANG", &variables[VARIABLE_LANG], @@ -121,7 +121,7 @@ int locale_setup(void) { log_warning("Failed to read /etc/locale.conf: %s", strerror(-r)); } -#if defined(TARGET_FEDORA) || defined(TARGET_ALTLINUX) || defined(TARGET_MEEGO) +#if defined(TARGET_FEDORA) || defined(TARGET_ALTLINUX) if (r <= 0 && (r = parse_env_file("/etc/sysconfig/i18n", NEWLINE, "LANG", &variables[VARIABLE_LANG],