summaryrefslogtreecommitdiffstats
path: root/config/live.cfg
diff options
context:
space:
mode:
Diffstat (limited to 'config/live.cfg')
-rw-r--r--config/live.cfg27
1 files changed, 22 insertions, 5 deletions
diff --git a/config/live.cfg b/config/live.cfg
index af07ece..5b8b4cb 100644
--- a/config/live.cfg
+++ b/config/live.cfg
@@ -44,12 +44,20 @@ my $_l = {
#[ '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 } ],
),
# blacklist pata_acpi
[ 'files/blacklist_ide.conf', '/etc/modprobe.d/blacklist_ide.conf', { mode => 0644 } ],
# lock bluedevil, radeon-firmware, kernel-firnware-nonfree
[ 'files/pkgs.pm', '/usr/lib/libDrakX/pkgs.pm', { mode => 0644 } ],
+ # shorewall6
+ #[ 'files/interfaces', '/etc/shorewall6/interfaces', { mode => 0600 } ],
+
+ # clean live files
+ [ 'files/live.51-mageia-resume.conf', '/etc/dracut.conf.d/51-mageia-resume.conf', { mode => 0644 } ],
+ [ 'files/live.modprobe.conf', '/etc/modprobe.conf', { mode => 0644 } ],
+
# add local repos
if_($live->{settings}{arch} eq 'i586',
@@ -72,6 +80,12 @@ my $_l = {
[ 'files/live.modprobe.CD', '/etc/modprobe.d/live.conf', { mode => 0644, no_install => 1 } ],
# livecd specific initrd
[ 'files/live-dracut.conf', '/etc/dracut.conf.d/60-live.conf', { mode => 0644, no_install => 1 } ],
+ # live media harddrake
+# [ 'files/harddrake2/kernel', '/etc/sysconfig/harddrake2/kernel', { mode => 0644 } ],
+# [ 'files/harddrake2/service.conf', '/etc/sysconfig/harddrake2/service.conf', { mode => 0644, no_install => 1 } ],
+# [ 'files/harddrake2/mandrake_everytime', '/etc/rc.d/init.d/mandrake_everytime', { mode => 0755 } ],
+# [ 'files/harddrake2/services.pm', '/usr/lib/libDrakX/services.pm', { mode => 0644 } ],
+# [ 'files/harddrake2/display_driver_helper', '/usr/sbin/display_driver_helper', { mode => 0755 } ],
),
#- disable first boot wizard at live boot
[ 'files/firstboot', '/etc/sysconfig/firstboot', { mode => 0644 } ],
@@ -99,8 +113,8 @@ my $_l = {
(map { [ 'files/draksnapshot.sysconfig', $_ . '/.draksnapshot', { mode => 0644, no_install => 1 } ] } @user_config_dirs),
[ 'files/compute-ooo-dicts.pl', '/usr/sbin/compute-ooo-dicts.pl', { mode => 0755 } ],
[ 'files/compute-i18n-list.pl', '/usr/sbin/compute-i18n-list.pl', { mode => 0755 } ],
- if_($live->{settings}{desktop} eq 'GNOME',
- [ 'files/99dm-reload.xsetup', '/etc/X11/xsetup.d/', { mode => 0755 } ]),
+# 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' ],
),
@@ -110,6 +124,7 @@ 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",
@@ -136,7 +151,7 @@ my $_l = {
#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),
+ qw(sshd msec),
qw(hcfpci hsf slmodemd),
qw(portmap nfs-common),
qw(kav4ws freshclam clamd),
@@ -203,6 +218,8 @@ my $_l = {
),
if_($live->{settings}{desktop} eq 'GNOME',
"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',
@@ -216,7 +233,7 @@ my $_l = {
"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",
- #grub2
+ # grub2
"urpmi --auto grub2 ||:",
),
additional_media => [
@@ -264,7 +281,7 @@ my $_l = {
media => {
storage => 'cdrom',
bootloader_timeout => 10,
- boot_entries => [ "" => "", "linux" => " install", "safe" => "", "harddisk" => "" ],
+ boot_entries => [ "" => "", "linux" => " install", "harddisk" => "" ],
if_($live->{settings}{product} =~ /LiveCD/i,
source => build_one_label($live),
pre => [ 'for i in seq 1 5; do showlabels --removable | grep '.build_one_label($live).'; if [ $? -eq 0 ]; then break; fi; sleep 1; done' ],