From: Lennart Poettering <lennart@poettering.net>
Date: Sun, 10 Sep 2017 10:19:02 +0000 (+0200)
Subject: units: properly unset the l10n environment variables where we need to
X-Git-Tag: v235~108^2~3
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=82f93439af6ec0e7444fc35260c4a4fc5b30d19c;p=thirdparty%2Fsystemd.git

units: properly unset the l10n environment variables where we need to

Now that we have UnsetEnvironment=, let's make proper use of it for
unsetting l10n settings for console gettys.

Fixes: #6407
---

diff --git a/units/debug-shell.service.in b/units/debug-shell.service.in
index 59f6e494b37..f72e5ef6b63 100644
--- a/units/debug-shell.service.in
+++ b/units/debug-shell.service.in
@@ -28,7 +28,7 @@ KillSignal=SIGHUP
 
 # Unset locale for the console getty since the console has problems
 # displaying some internationalized messages.
-Environment=LANG= LANGUAGE= LC_CTYPE= LC_NUMERIC= LC_TIME= LC_COLLATE= LC_MONETARY= LC_MESSAGES= LC_PAPER= LC_NAME= LC_ADDRESS= LC_TELEPHONE= LC_MEASUREMENT= LC_IDENTIFICATION=
+UnsetEnvironment=LANG LANGUAGE LC_CTYPE LC_NUMERIC LC_TIME LC_COLLATE LC_MONETARY LC_MESSAGES LC_PAPER LC_NAME LC_ADDRESS LC_TELEPHONE LC_MEASUREMENT LC_IDENTIFICATION
 
 [Install]
 WantedBy=sysinit.target
diff --git a/units/getty@.service.m4 b/units/getty@.service.m4
index b62f1b9225b..ff1b3c3d87a 100644
--- a/units/getty@.service.m4
+++ b/units/getty@.service.m4
@@ -51,7 +51,7 @@ SendSIGHUP=yes
 
 # Unset locale for the console getty since the console has problems
 # displaying some internationalized messages.
-Environment=LANG= LANGUAGE= LC_CTYPE= LC_NUMERIC= LC_TIME= LC_COLLATE= LC_MONETARY= LC_MESSAGES= LC_PAPER= LC_NAME= LC_ADDRESS= LC_TELEPHONE= LC_MEASUREMENT= LC_IDENTIFICATION=
+UnsetEnvironment=LANG LANGUAGE LC_CTYPE LC_NUMERIC LC_TIME LC_COLLATE LC_MONETARY LC_MESSAGES LC_PAPER LC_NAME LC_ADDRESS LC_TELEPHONE LC_MEASUREMENT LC_IDENTIFICATION
 
 [Install]
 WantedBy=getty.target