summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorColin Guthrie <colin@mageia.org>2015-02-08 19:43:01 +0000
committerColin Guthrie <colin@mageia.org>2015-02-08 19:43:01 +0000
commit77c1fc76e86949d646fd6d6b9839b0320cc5f838 (patch)
tree73af54a0b628766826d9213763150fc8009799d5
parent56b306e75f806b53b1e5f81c6910f0ce9c54d080 (diff)
downloaddraklive-config-77c1fc76e86949d646fd6d6b9839b0320cc5f838.tar
draklive-config-77c1fc76e86949d646fd6d6b9839b0320cc5f838.tar.gz
draklive-config-77c1fc76e86949d646fd6d6b9839b0320cc5f838.tar.bz2
draklive-config-77c1fc76e86949d646fd6d6b9839b0320cc5f838.tar.xz
draklive-config-77c1fc76e86949d646fd6d6b9839b0320cc5f838.zip
Restore GDM restart to reload i18n settings.
This was disabled in 8fbe674e but it seems it's (currently) needed under GDM to make it load the correct locale settings for the user.
-rw-r--r--config/live.cfg5
-rwxr-xr-xfiles/99dm-reload.xsetup9
2 files changed, 10 insertions, 4 deletions
diff --git a/config/live.cfg b/config/live.cfg
index 3031e40..ab75407 100644
--- a/config/live.cfg
+++ b/config/live.cfg
@@ -111,8 +111,9 @@ 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 } ]),
+ if_($live->{settings}{desktop} eq 'GNOME',
+ [ '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 f88368a..97b8601 100755
--- a/files/99dm-reload.xsetup
+++ b/files/99dm-reload.xsetup
@@ -1,3 +1,8 @@
#!/bin/sh
-LOCK=/var/lock/reload-dm
-[ -f "$LOCK" ] && rm -f $LOCK && if [ x"$RUNNING_UNDER_GDM" = xtrue ]; then /usr/bin/systemctl --no-block restart prefdm.service; fi;
+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