unit: serialize active timestamps

[elogind.git] / src / locale-setup.c

diff --git a/src/locale-setup.c b/src/locale-setup.c
index 78fa2123f8e23f4edfa124223571430965de95d3..b3375e99b1262d2f0c31c8f57d391166ea3b34c0 100644 (file)
--- a/src/locale-setup.c
+++ b/src/locale-setup.c
@@ -93,9 +93,9 @@ int locale_setup(void) {
         }
 
         /* Hmm, nothing set on the kernel cmd line? Then let's
-         * try /etc/locale */
+         * try /etc/locale.conf */
         if (r <= 0 &&
-            (r = parse_env_file("/etc/locale", NEWLINE,
+            (r = parse_env_file("/etc/locale.conf", NEWLINE,
                                "LANG",              &variables[VARIABLE_LANG],
                                "LC_CTYPE",          &variables[VARIABLE_LC_CTYPE],
                                "LC_NUMERIC",        &variables[VARIABLE_LC_NUMERIC],
@@ -112,7 +112,7 @@ int locale_setup(void) {
                                 NULL)) < 0) {
 
                 if (r != -ENOENT)
-                        log_warning("Failed to read /etc/locale: %s", strerror(-r));
+                        log_warning("Failed to read /etc/locale.conf: %s", strerror(-r));
         }
 
 #ifdef TARGET_FEDORA
@@ -135,7 +135,7 @@ int locale_setup(void) {
                         log_warning("Failed to read /etc/sysconfig/language: %s", strerror(-r));
         }
 
-#elif defined(TARGET_DEBIAN)
+#elif defined(TARGET_DEBIAN) || defined(TARGET_UBUNTU)
         if (r <= 0 &&
             (r = parse_env_file("/etc/default/locale", NEWLINE,
                                 "LANG", &variables[VARIABLE_LANG],