diff options
| author | Ray Strode <rstrode@redhat.com> | 2015-02-27 13:39:35 -0500 |
|---|---|---|
| committer | Ray Strode <rstrode@redhat.com> | 2015-03-25 15:26:46 -0400 |
| commit | f8963d242a3c9b25694021fff90282997a096927 (patch) | |
| tree | 7c1115d6d8e02cf061e869fa56002ae3e167944a | |
| parent | 0194872467764220c838385432b15b280ffa7ddf (diff) | |
| download | gdm-f8963d242a3c9b25694021fff90282997a096927.tar.gz | |
systemd: import language into daemon environment
By default GDM is started with a pretty blank environment.
This commit makes sure that the default locale for the
system is used.
https://bugzilla.gnome.org/show_bug.cgi?id=745286
| -rw-r--r-- | data/Makefile.am | 2 | ||||
| -rw-r--r-- | data/gdm.service.in | 1 |
2 files changed, 3 insertions, 0 deletions
diff --git a/data/Makefile.am b/data/Makefile.am index 1b79bc3b..6d57b016 100644 --- a/data/Makefile.am +++ b/data/Makefile.am @@ -197,6 +197,8 @@ gdm.service: $(srcdir)/gdm.service.in $(AM_V_GEN)sed \ -e 's,[@]sbindir[@],$(sbindir),g' \ -e 's,[@]GDM_INITIAL_VT[@],$(GDM_INITIAL_VT),g' \ + -e 's,[@]LANG_CONFIG_FILE[@],$(LANG_CONFIG_FILE),g' \ + -e 's, *$$,,g' \ < $< > $@ systemdsystemunit += gdm.service CLEANFILES += gdm.service diff --git a/data/gdm.service.in b/data/gdm.service.in index a84da64b..bfc5bb9a 100644 --- a/data/gdm.service.in +++ b/data/gdm.service.in @@ -14,6 +14,7 @@ IgnoreSIGPIPE=no BusName=org.gnome.DisplayManager StandardOutput=syslog StandardError=inherit +EnvironmentFile=@LANG_CONFIG_FILE@ [Install] Alias=display-manager.service |