summaryrefslogtreecommitdiffstats
path: root/config
diff options
context:
space:
mode:
authorThomas Backlund <tmb@mageia.org>2016-07-03 21:37:29 +0300
committerThomas Backlund <tmb@mageia.org>2016-07-03 21:37:29 +0300
commitcb8e46e5332e8b9c2174732bdfac336547040f52 (patch)
treec4276af7f86f679d9b25009cb442ff4ae280c8a5 /config
parent24ff0e4cf52a2a925e807e36be5ac83ea03a2764 (diff)
downloaddraklive-config-cb8e46e5332e8b9c2174732bdfac336547040f52.tar
draklive-config-cb8e46e5332e8b9c2174732bdfac336547040f52.tar.gz
draklive-config-cb8e46e5332e8b9c2174732bdfac336547040f52.tar.bz2
draklive-config-cb8e46e5332e8b9c2174732bdfac336547040f52.tar.xz
draklive-config-cb8e46e5332e8b9c2174732bdfac336547040f52.zip
live.cfg: drop some unused and uncomented stuff
Diffstat (limited to 'config')
-rw-r--r--config/live.cfg15
1 files changed, 2 insertions, 13 deletions
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",