summaryrefslogtreecommitdiffstats
path: root/config
diff options
context:
space:
mode:
authorThomas Backlund <tmb@mageia.org>2012-05-21 18:54:06 +0000
committerThomas Backlund <tmb@mageia.org>2012-05-21 18:54:06 +0000
commit7eead25cd00a547753ec94f6b301c5b32968291b (patch)
tree0865a6d7c1939082917acf5de3b4f85ba77bd09d /config
parent610389a9b9c63123d8557efd19e719da385433cf (diff)
downloaddraklive-config-7eead25cd00a547753ec94f6b301c5b32968291b.tar
draklive-config-7eead25cd00a547753ec94f6b301c5b32968291b.tar.gz
draklive-config-7eead25cd00a547753ec94f6b301c5b32968291b.tar.bz2
draklive-config-7eead25cd00a547753ec94f6b301c5b32968291b.tar.xz
draklive-config-7eead25cd00a547753ec94f6b301c5b32968291b.zip
really fix showing draklive-install and register icons on live GNOME desktop
Diffstat (limited to 'config')
-rw-r--r--config/auto_inst.cfg.pl2
-rw-r--r--config/live.cfg9
2 files changed, 9 insertions, 2 deletions
diff --git a/config/auto_inst.cfg.pl b/config/auto_inst.cfg.pl
index 99452a1..5840900 100644
--- a/config/auto_inst.cfg.pl
+++ b/config/auto_inst.cfg.pl
@@ -304,8 +304,6 @@ $o = {
"ln -sf /lib/systemd/system/graphical.target /etc/systemd/system/default.target",
# have inittab match systemd defaulting to init 5
"perl -pi -e 's/^id:3:initdefault:/id:5:initdefault:/' '/etc/inittab'",
- # enable icons on gnome desktop
- if_($has_gnome, "gsettings set org.gnome.desktop.background show-desktop-icons true"),
#- FIXME: in any::set_autologin, unlink if gdm/kdm conf file and binary exist
if_($has_xfce || $has_lxde, "rm -f /etc/sysconfig/autologin"),
if_($distro_theme eq 'Liveusb-Rw',
diff --git a/config/live.cfg b/config/live.cfg
index ad7c890..18595d9 100644
--- a/config/live.cfg
+++ b/config/live.cfg
@@ -39,6 +39,12 @@ my $_l = {
[ 'files/desktop-directories-liveusb-rw', '/etc/X11/xinit.d/xx_desktop-directories-liveusb-rw', { mode => 0755, no_install => 1 } ],
[ 'files/draklive-install.usb', '/etc/sysconfig/draklive-install', { mode => 0755 } ],
),
+ # fix gnome-shell not showing draklive-install and register icons on desktop in live mode
+ if_($live->{settings}{desktop} eq 'GNOME',
+ [ 'files/draklive-install.desktop', '/home/live/Desktop/draklive-install.desktop', { mode => 0755, no_install => 1 } ],
+ [ 'files/register.desktop', '/home/live/Desktop/register.desktop', { mode => 0755 } ],
+ [ 'files/01_gsettings-desktop-schemas.gschema.override', '/usr/share/glib-2.0/schemas/01_gsettings-desktop-schemas.gschema.override', { mode => 0644, no_install => 1 } ],
+ ),
# disable suspend and hibernate in live mode
[ 'files/50-disable-suspend.pkla', '/etc/polkit-1/localauthority/50-local.d/50-disable-suspend.pkla', { mode => 0644, no_install => 1 } ],
#- make cups the default spooler
@@ -180,6 +186,9 @@ my $_l = {
"cp /etc/akonadi/mysql-global-mobile.conf /etc/akonadi/mysql-global.conf",
"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',
+ "glib-compile-schemas /usr/share/glib-2.0/schemas/",
+ ),
# FIXME
#if_($live->{settings}{desktop} eq 'GNOME',
# "mkdir -p '/home/$live->{settings}{default_user}/.config/autostart'",