diff options
| author | Thomas Backlund <tmb@mageia.org> | 2015-03-15 10:49:52 +0100 |
|---|---|---|
| committer | Thomas Backlund <tmb@mageia.org> | 2015-03-15 10:49:52 +0100 |
| commit | 1230730eb4306fab7051f9516a29a194de95e631 (patch) | |
| tree | 939b09b9501a83372e79d26e3e6fd9ed7299657c | |
| parent | 5cb9882e08aa96e30cbc7ca07a12f2771d6a93bc (diff) | |
| download | draklive-config-1230730eb4306fab7051f9516a29a194de95e631.tar draklive-config-1230730eb4306fab7051f9516a29a194de95e631.tar.gz draklive-config-1230730eb4306fab7051f9516a29a194de95e631.tar.bz2 draklive-config-1230730eb4306fab7051f9516a29a194de95e631.tar.xz draklive-config-1230730eb4306fab7051f9516a29a194de95e631.zip | |
reload DMs to get correct locale
| -rw-r--r-- | config/live.cfg | 5 | ||||
| -rwxr-xr-x | files/99dm-reload.xsetup | 2 |
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 |