summaryrefslogtreecommitdiffstats
path: root/config
diff options
context:
space:
mode:
authorThomas Backlund <tmb@mageia.org>2015-04-08 21:40:52 +0200
committerThomas Backlund <tmb@mageia.org>2015-04-08 21:40:52 +0200
commit28c5c45854d59e9c17aab9122469663b87bd00f9 (patch)
tree6e193b76a61de6feb50b4954fa94b0d95c81a743 /config
parent7ddb4497c59124aeefaae5206b1ec95acef5445f (diff)
downloaddraklive-config-28c5c45854d59e9c17aab9122469663b87bd00f9.tar
draklive-config-28c5c45854d59e9c17aab9122469663b87bd00f9.tar.gz
draklive-config-28c5c45854d59e9c17aab9122469663b87bd00f9.tar.bz2
draklive-config-28c5c45854d59e9c17aab9122469663b87bd00f9.tar.xz
draklive-config-28c5c45854d59e9c17aab9122469663b87bd00f9.zip
minor cleanups
Diffstat (limited to 'config')
-rw-r--r--config/live.cfg17
1 files changed, 6 insertions, 11 deletions
diff --git a/config/live.cfg b/config/live.cfg
index 36cb25c..e2a818c 100644
--- a/config/live.cfg
+++ b/config/live.cfg
@@ -41,7 +41,6 @@ my $_l = {
),
# 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', '/usr/share/applications/mageia-draklive-install.desktop', { mode => 0755, no_install => 1 } ],
[ 'files/register.desktop', '/usr/share/applications/register.desktop', { mode => 0644 } ],
[ '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 } ],
@@ -55,10 +54,10 @@ my $_l = {
# add local repos
if_($live->{settings}{arch} eq 'i586',
- [ 'files/mga_rpms/i586/mga_rpms', '/var/local/mga_rpms' ],
+ [ 'files/mga_rpms/i586/mga_rpms', '/var/local/mga_rpms' ],
),
if_($live->{settings}{arch} eq 'x86_64',
- [ 'files/mga_rpms/x86_64/mga_rpms', '/var/local/mga_rpms' ],
+ [ 'files/mga_rpms/x86_64/mga_rpms', '/var/local/mga_rpms' ],
),
# 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 } ],
@@ -83,11 +82,11 @@ my $_l = {
[ 'files/draklive-install.d/run.d/home-live-permissions.sh', '/etc/draklive-install.d/run.d/home-live-permissions.sh', { mode => 755 } ],
# fix for /var/lib/gdm sometimes ending up as root:root
if_($live->{settings}{desktop} eq 'GNOME',
- [ 'files/draklive-install.d/run.d/gdm-permissions.sh', '/etc/draklive-install.d/run.d/gdm-permissions.sh', { mode => 755 } ]),
-
+ [ 'files/draklive-install.d/run.d/gdm-permissions.sh', '/etc/draklive-install.d/run.d/gdm-permissions.sh', { mode => 755 } ]
+ ),
if_($live->{settings}{desktop} eq 'KDE4',
- [ 'files/draklive-install.d/run.d/generate-gtk-icon-cache.sh', '/etc/draklive-install.d/run.d/generate-gtk-icon-cache.sh', { mode => 755 } ]),
-
+ [ 'files/draklive-install.d/run.d/generate-gtk-icon-cache.sh', '/etc/draklive-install.d/run.d/generate-gtk-icon-cache.sh', { mode => 755 } ]
+ ),
#- sysconfig files for first boot
[ $live->{settings}{media} eq 'usb' ?
"files/finish-install.$live->{settings}{media}" :
@@ -109,9 +108,6 @@ my $_l = {
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' ],
- ),
],
remove_files => [
(map { "/etc/modprobe.preload.d/$_" } qw(cpufreq pcmcia rfswitch)),
@@ -226,7 +222,6 @@ my $_l = {
# add local medias
"urpmi.addmedia 'Live Core' /var/local/mga_rpms/core with media_info/hdlist.cz",
"urpmi.addmedia 'Live Nonfree' /var/local/mga_rpms/nonfree with media_info/hdlist.cz",
-
),
additional_media => [
if_($live->{settings}{updates_repository},