summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGunnar Hjalmarsson <gunnarhj@ubuntu.com>2020-02-07 20:28:16 +0100
committerRobert Ancell <robert.ancell@gmail.com>2020-02-28 05:49:47 -0800
commit89e737dba129f514e6b8947a9b6fd277c531e9c3 (patch)
tree83fb20bc1505d7591d96c85df2f92db18c2a5426
parent03f218981733e50d810767f9d04e42ee156f7feb (diff)
downloadlightdm-git-89e737dba129f514e6b8947a9b6fd277c531e9c3.tar.gz
Only set LANGUAGE if not in a live session
Fixes LP: #1861481
-rw-r--r--debian/patches/04_language_handling.patch7
1 files changed, 5 insertions, 2 deletions
diff --git a/debian/patches/04_language_handling.patch b/debian/patches/04_language_handling.patch
index 6a46f8ec..551fa665 100644
--- a/debian/patches/04_language_handling.patch
+++ b/debian/patches/04_language_handling.patch
@@ -69,12 +69,15 @@ Index: lightdm/src/seat.c
===================================================================
--- lightdm.orig/src/seat.c
+++ lightdm/src/seat.c
-@@ -987,7 +987,7 @@ configure_session (Session *session, Ses
+@@ -987,7 +987,10 @@ configure_session (Session *session, Se
}
if (language && language[0] != '\0')
{
- session_set_env (session, "LANG", language);
-+ session_set_env (session, "LANGUAGE", language);
++ /* Only set LANGUAGE if not in a live session
++ https://launchpad.net/bugs/1861481 */
++ if (system ("df | grep -q ^/cow") != 0)
++ session_set_env (session, "LANGUAGE", language);
session_set_env (session, "GDM_LANG", language);
}
}