util: modernize get_parent_of_pid() a bit

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

diff --git a/src/locale-setup.c b/src/locale-setup.c
index f6fd97ebb15b80287982cf1f73890807680e9d91..08e289d4eed6c57a62965118286382a79e4d33cb 100644 (file)
--- a/src/locale-setup.c
+++ b/src/locale-setup.c
@@ -65,11 +65,11 @@ static const char * const variable_names[_VARIABLE_MAX] = {
 
 int locale_setup(void) {
         char *variables[_VARIABLE_MAX];
-        int r, i;
+        int r = 0, i;
 
         zero(variables);
 
-        if (detect_virtualization(NULL) <= 0)
+        if (detect_container(NULL) <= 0)
                 if ((r = parse_env_file("/proc/cmdline", WHITESPACE,
 #ifdef TARGET_FEDORA
                                         "LANG",                     &variables[VARIABLE_LANG],
@@ -139,7 +139,19 @@ int locale_setup(void) {
 #elif defined(TARGET_DEBIAN) || defined(TARGET_UBUNTU)
         if (r <= 0 &&
             (r = parse_env_file("/etc/default/locale", NEWLINE,
-                                "LANG", &variables[VARIABLE_LANG],
+                                "LANG",              &variables[VARIABLE_LANG],
+                                "LC_CTYPE",          &variables[VARIABLE_LC_CTYPE],
+                                "LC_NUMERIC",        &variables[VARIABLE_LC_NUMERIC],
+                                "LC_TIME",           &variables[VARIABLE_LC_TIME],
+                                "LC_COLLATE",        &variables[VARIABLE_LC_COLLATE],
+                                "LC_MONETARY",       &variables[VARIABLE_LC_MONETARY],
+                                "LC_MESSAGES",       &variables[VARIABLE_LC_MESSAGES],
+                                "LC_PAPER",          &variables[VARIABLE_LC_PAPER],
+                                "LC_NAME",           &variables[VARIABLE_LC_NAME],
+                                "LC_ADDRESS",        &variables[VARIABLE_LC_ADDRESS],
+                                "LC_TELEPHONE",      &variables[VARIABLE_LC_TELEPHONE],
+                                "LC_MEASUREMENT",    &variables[VARIABLE_LC_MEASUREMENT],
+                                "LC_IDENTIFICATION", &variables[VARIABLE_LC_IDENTIFICATION],
                                 NULL)) < 0) {
 
                 if (r != -ENOENT)