nspawn: Set LANG to C.UTF-8

Let's default to a UTF-8 locale when running commands using nspawn.

diff --git a/src/nspawn/nspawn.c b/src/nspawn/nspawn.c
index d2300755655271c64292c06948937b14df365b15..59768bcc0b8d4c32da07f5d248cec4f91adb3a46 100644 (file)
--- a/src/nspawn/nspawn.c
+++ b/src/nspawn/nspawn.c
@@ -3218,6 +3218,7 @@ static int inner_child(
                 NULL, /* LISTEN_PID */
                 NULL, /* NOTIFY_SOCKET */
                 NULL, /* CREDENTIALS_DIRECTORY */
+                NULL, /* LANG */
                 NULL
         };
         const char *exec_target;
@@ -3486,6 +3487,16 @@ static int inner_child(
                 n_env++;
         }
 
+        if (arg_start_mode != START_BOOT) {
+                /* If we're running a command in the container, let's default to the C.UTF-8 locale as it's
+                 * part of glibc these days and was backported to most distros a long time before it got
+                 * added to upstream glibc. */
+                envp[n_env] = strdup("LANG=C.UTF-8");
+                if (!envp[n_env])
+                        return log_oom();
+                n_env++;
+        }
+
         env_use = strv_env_merge(envp, os_release_pairs, arg_setenv);
         if (!env_use)
                 return log_oom();