summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--config/live.cfg5
-rwxr-xr-xfiles/99dm-reload.xsetup2
2 files changed, 2 insertions, 5 deletions
diff --git a/config/live.cfg b/config/live.cfg
index ab75407..71ece5e 100644
--- a/config/live.cfg
+++ b/config/live.cfg
@@ -111,9 +111,8 @@ my $_l = {
(map { [ 'files/draksnapshot.sysconfig', $_ . '/.draksnapshot', { mode => 0644, no_install => 1 } ] } @user_config_dirs),
[ 'files/compute-ooo-dicts.pl', '/usr/sbin/compute-ooo-dicts.pl', { mode => 0755 } ],
[ 'files/compute-i18n-list.pl', '/usr/sbin/compute-i18n-list.pl', { mode => 0755 } ],
- if_($live->{settings}{desktop} eq 'GNOME',
- [ 'files/99dm-reload.xsetup', '/etc/X11/xsetup.d/', { mode => 0755 } ]
- ),
+ # reload DMs to get correct locale
+ [ 'files/99dm-reload.xsetup', '/etc/X11/xsetup.d/', { mode => 0755 } ],
if_($live->{settings}{product} =~ /guadec/i,
[ 'files/GUADEC-booklet.desktop', '/usr/share/nautilus/default-desktop/booklet.desktop' ],
),
diff --git a/files/99dm-reload.xsetup b/files/99dm-reload.xsetup
index 97b8601..55cf895 100755
--- a/files/99dm-reload.xsetup
+++ b/files/99dm-reload.xsetup
@@ -2,7 +2,5 @@
LOCK=/run/lock/reload-dm
if [ -f "$LOCK" ]; then
rm -f $LOCK
- if [ x"$RUNNING_UNDER_GDM" = xtrue ]; then
/usr/bin/systemctl --no-block restart display-manager.service
- fi
fi