summaryrefslogtreecommitdiff
path: root/units
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2017-09-10 12:19:02 +0200
committerLennart Poettering <lennart@poettering.net>2017-09-14 15:17:40 +0200
commit82f93439af6ec0e7444fc35260c4a4fc5b30d19c (patch)
tree626808a349adbe8d4e03f1956f604673e306b4dc /units
parent42cc99d5ec0197ea05d8da05e0457585e5106419 (diff)
downloadsystemd-82f93439af6ec0e7444fc35260c4a4fc5b30d19c.tar.gz
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
Diffstat (limited to 'units')
-rw-r--r--units/debug-shell.service.in2
-rw-r--r--units/getty@.service.m42
2 files changed, 2 insertions, 2 deletions
diff --git a/units/debug-shell.service.in b/units/debug-shell.service.in
index 59f6e494b3..f72e5ef6b6 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 b62f1b9225..ff1b3c3d87 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