summaryrefslogtreecommitdiffstats
path: root/config
diff options
context:
space:
mode:
authorMartin Whitaker <mageia@martin-whitaker.me.uk>2016-12-06 22:32:18 +0000
committerMartin Whitaker <mageia@martin-whitaker.me.uk>2016-12-06 22:32:18 +0000
commit9d2940006ca7913c913814cd3c5984786c17d2a1 (patch)
tree2fb630d6b90cd4f03daf655cb6aa8f2476de89f2 /config
parent1e48ae643596c1084e1c9d6e124807dcd11f2439 (diff)
downloaddraklive-config-9d2940006ca7913c913814cd3c5984786c17d2a1.tar
draklive-config-9d2940006ca7913c913814cd3c5984786c17d2a1.tar.gz
draklive-config-9d2940006ca7913c913814cd3c5984786c17d2a1.tar.bz2
draklive-config-9d2940006ca7913c913814cd3c5984786c17d2a1.tar.xz
draklive-config-9d2940006ca7913c913814cd3c5984786c17d2a1.zip
Drop restart of GDM in xsetup.
No longer needed, as we set the locale before GDM is started.
Diffstat (limited to 'config')
-rw-r--r--config/live.cfg10
1 files changed, 2 insertions, 8 deletions
diff --git a/config/live.cfg b/config/live.cfg
index 94d9bd0..0bff65d 100644
--- a/config/live.cfg
+++ b/config/live.cfg
@@ -101,12 +101,6 @@ 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 } ],
- # reload GDM to get correct locale
- if_($live->{settings}{desktop} eq 'GNOME',
- if_($live->{settings}{media} eq 'DVD',
- [ 'files/99dm-reload.xsetup', '/etc/X11/xsetup.d/', { mode => 0755 } ],
- ),
- ),
],
remove_files => [
(map { "/etc/modprobe.preload.d/$_" } qw(cpufreq pcmcia rfswitch)),
@@ -202,8 +196,8 @@ my $_l = {
"ak=/etc/draklive-install.d/run.d/restore-akonadi-config.sh; echo -e '#!/bin/sh\ncp /etc/akonadi/mysql-global-standard.conf /etc/akonadi/mysql-global.conf' > \$ak; chmod +x \$ak",
),
if_($live->{settings}{desktop} eq 'GNOME',
- # compile schema to get dralkive-install in menu
- "glib-compile-schemas /usr/share/glib-2.0/schemas/",
+ # compile schema to get draklive-install in menu
+ "glib-compile-schemas /usr/share/glib-2.0/schemas/",
),
# switch to NetworkManager