From cb8e46e5332e8b9c2174732bdfac336547040f52 Mon Sep 17 00:00:00 2001
From: Thomas Backlund <tmb@mageia.org>
Date: Sun, 3 Jul 2016 21:37:29 +0300
Subject: live.cfg: drop some unused and uncomented stuff

---
 config/live.cfg | 15 ++-------------
 1 file changed, 2 insertions(+), 13 deletions(-)

(limited to 'config/live.cfg')

diff --git a/config/live.cfg b/config/live.cfg
index 8463965..e2412fd 100644
--- a/config/live.cfg
+++ b/config/live.cfg
@@ -33,9 +33,8 @@ my $_l = {
         if_($live->{settings}{default_user}, preselect_kdm_user => $live->{settings}{default_user}),
         langs_always => [ 'en_US' ],
         files => [
-	    # fix gnome-shell not showing draklive-install and register icons on desktop in live mode
+	    # fix gnome-shell not showing draklive-install icon in menu in live mode
 	    if_($live->{settings}{desktop} eq 'GNOME',
-		[ '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 } ],
             ),
@@ -111,7 +110,6 @@ my $_l = {
             "/etc/udev/rules.d/70-persistent-*.rules",
             "/var/lib/dbus/machine-id",
             "/etc/ssh/ssh_host_*",
-            #"/etc/X11/wmsession.d/29drak3d",
         ],
         module_options => {
             loop => "max_loop=64",
@@ -135,7 +133,6 @@ my $_l = {
             qw(capi4linux ibod isdn4linux isdnlog bpalogin),
             qw(cpqarrayd upsd upsmon), # uncommon hardware
             qw(lisa ntpd snmpd), # unneeded software
-            #qw(acpi acpid apmd),     # enabled by drakboot when needed
             qw(dkms),           # slows down live boot, reenabled after install
             qw(anacron crond), # slows down basic usage and install, reenabled after install
             qw(sshd msec),
@@ -195,18 +192,10 @@ 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/",
-                        #	"su - live  -c xdg-user-dirs-update",
-                        #	"killall gpg-agent",
                             ),
-			    # FIXME
-                            #if_($live->{settings}{desktop} eq 'GNOME',
-			    #	"mkdir -p '/home/$live->{settings}{default_user}/.config/autostart'",
-			    #	"for file in '/etc/xdg/autostart/tracker*.desktop'; do sed s/X-GNOME-Autostart-enabled=true/X-GNOME-Autostart-enabled=false/g $file > '/home/$live->{settings}{default_user}/.config/autostart/$(basename $file)'; done",
-			    #),
 
-                            'd=/var/lib/flash-player-plugin/; [ -d $d ] && rm -f $d/*.rpm',
-                            
                             # 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",
-- 
cgit v1.2.1