From: Lennart Poettering <lennart@poettering.net>
Date: Mon, 12 Nov 2018 12:12:39 +0000 (+0100)
Subject: locale-setup: default to C.UTF-8
X-Git-Tag: v240~320^2~11
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0db9bd200f62a5707ea16552537dcaad2d9e9331;p=thirdparty%2Fsystemd.git

locale-setup: default to C.UTF-8

Most distributions already were shipping a C.UTF-8 locale and even Fedora
now supports the C.UTF-8 locale, and there's clear indication that this
is going upstream too. Hence, let's default to it now too, if nothing
else is set.

Note that this is only a fallback if noting else is set, and since
distros generally configure a default for this behaviour shouldn't
really change in installed systems.

On new systems this makes vconsole.conf redundant.
---

diff --git a/src/core/locale-setup.c b/src/core/locale-setup.c
index 5fd54773b39..dc6157624de 100644
--- a/src/core/locale-setup.c
+++ b/src/core/locale-setup.c
@@ -79,16 +79,28 @@ int locale_setup(char ***environment) {
                 }
         }
 
-        if (!strv_isempty(add)) {
-                char **e;
+        if (strv_isempty(add)) {
+                /* If no locale is configured then default to C.UTF-8. */
 
-                e = strv_env_merge(2, *environment, add);
-                if (!e) {
+                add = strv_new("LANG=C.UTF-8");
+                if (!add) {
+                        r = -ENOMEM;
+                        goto finish;
+                }
+        }
+
+        if (strv_isempty(*environment))
+                strv_free_and_replace(*environment, add);
+        else {
+                char **merged;
+
+                merged = strv_env_merge(2, *environment, add);
+                if (!merged) {
                         r = -ENOMEM;
                         goto finish;
                 }
 
-                strv_free_and_replace(*environment, e);
+                strv_free_and_replace(*environment, merged);
         }
 
         r = 0;