summaryrefslogtreecommitdiffstats
path: root/config/live.cfg
diff options
context:
space:
mode:
Diffstat (limited to 'config/live.cfg')
-rw-r--r--config/live.cfg9
1 files changed, 5 insertions, 4 deletions
diff --git a/config/live.cfg b/config/live.cfg
index 30cce52..1ca4356 100644
--- a/config/live.cfg
+++ b/config/live.cfg
@@ -34,9 +34,9 @@ my $_l = {
langs_always => [ 'en_US' ],
files => [
if_($live->{settings}{desktop} eq 'GNOME',
- # fix gnome-shell not showing draklive-install icon in menu in live mode
- [ 'files/01_gsettings-desktop-schemas.gschema.override', '/usr/share/glib-2.0/schemas/01_gsettings-desktop-schemas.gschema.override', { mode => 0644, no_install => 1 } ],
- [ 'files/glib2-branding.gschema.override', '/usr/share/glib-2.0/schemas/glib2-branding.gschema.override', { mode => 0644 } ],
+ # add draklive-install icon to favourites in live mode and disable screen locking
+ # (override files are processed in alphabetical order - make sure this one comes last)
+ [ 'files/live.gschema.override', '/usr/share/glib-2.0/schemas/live.gschema.override', { mode => 0644, no_install => 1 } ],
# disable Wayland when we know it won't work (workaround for mga#20079)
[ 'files/50gdm-disable-wayland.xsetup', '/etc/X11/xsetup.d/50gdm-disable-wayland.xsetup', { mode => 0755 } ],
),
@@ -198,7 +198,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 draklive-install in menu
+ # modify and compile schema to get draklive-install and Firefox in menu
+ "sed -i 's/epiphany.desktop/firefox.desktop/' /usr/share/glib-2.0/schemas/glib2-branding.gschema.override",
"glib-compile-schemas /usr/share/glib-2.0/schemas/",
# fix permissions to enable GDM to rerun if the user logs out
"chown -R gdm:gdm /var/lib/gdm",