Mga 4 final configsdistro/mga4

3 files changed, 32 insertions, 12 deletions

diff --git a/config/auto_inst.cfg.pl b/config/auto_inst.cfg.pl
index 9ff289b..4f48f8c 100644
--- a/config/auto_inst.cfg.pl
+++ b/config/auto_inst.cfg.pl
@@ -196,8 +196,8 @@ $o = {
            'mono',
 
 	   # block the kernels we dont want
-	   if_($ENV{DRAKLIVE_ARCH} eq 'i586', '/^kernel-desktop-/', '/^fglrx-kernel-3\.12\.6-desktop-/', '/^nvidia-current-kernel-3\.12\.6-desktop-/', '/^nvidia304-kernel-3\.12\.6-desktop-', '/^nvidia173-kernel-3\.12\.6-desktop-/', '/^vboxadditions-kernel-3\.12\.6-desktop-/'),
-           '/^kernel-server-/', '/^fglrx-kernel-3\.12\.6-server-/', '/^nvidia-current-kernel-3\.12\.6-server-/', '/^nvidia304-kernel-3\.12\.6-server-/', '/^nvidia173-kernel-3\.12\.6-server-/', '/^vboxadditions-kernel-3\.12\.6-server-/',
+	   if_($ENV{DRAKLIVE_ARCH} eq 'i586', '/^kernel-desktop-/', '/^fglrx-kernel-3\.12\.8-desktop-/', '/^nvidia-current-kernel-3\.12\.8-desktop-/', '/^nvidia304-kernel-3\.12\.8-desktop-', '/^nvidia173-kernel-3\.12\.8-desktop-/', '/^vboxadditions-kernel-3\.12\.8-desktop-/'),
+           '/^kernel-server-/', '/^fglrx-kernel-3\.12\.8-server-/', '/^nvidia-current-kernel-3\.12\.8-server-/', '/^nvidia304-kernel-3\.12\.8-server-/', '/^nvidia173-kernel-3\.12\.8-server-/', '/^vboxadditions-kernel-3\.12\.8-server-/',
 	   '/^broadcom-wl-/',
 	   
 	    if_($ENV{DRAKLIVE_PRODUCT} =~ /LiveCD/i, 'libreoffice-core'),
@@ -218,6 +218,9 @@ $o = {
            # broken
            'audacity',
            
+           #  not wanted
+           'mate-polkit',
+           
            # theese are in live media
            'broadcom-bcma-config', 'broadcom-ssb-config',
            
@@ -247,7 +250,7 @@ $o = {
 	   'usbutils', # we want lsusb
 	   'shared-mime-info', # needed for .desktop files to work atleast in gnome
 	   'mc', 'btrfs-progs', 'shorewall-ipv6', 'parted', 'glxinfo', 'patch',
-	   'mageia-doc-mcc-en',
+	   'mageia-doc-mcc-en', 'bind-utils',
 	   
 	   if_($ENV{DRAKLIVE_REGION} eq 'all', 'vim-enhanced', ),
 	   
@@ -256,7 +259,7 @@ $o = {
 
            if_($ENV{DRAKLIVE_PRODUCT} =~ /gaming/i, 'task-games'),
 
-           if_($has_gnome, 'gnome-shell', 'caribou', 'caribou-gtk3', 'gparted', 'gnome-classic-session',),
+           if_($has_gnome, 'gnome-shell', 'caribou', 'caribou-gtk3', 'brasero', 'gparted', 'gnome-classic-session',),
 
            if_($ENV{DRAKLIVE_PRODUCT} =~ /liveusb-rw/i,
                'samba-client',
@@ -337,8 +340,8 @@ $o = {
                              if_($has_xfce || $has_lxde, "rm -f /etc/sysconfig/autologin"),
                              if_($distro_theme eq 'Liveusb-Rw',
                                  #- set blue gtk theme for Liveusb-Rw in Gnome
-                                 "/usr/bin/gconftool-2 --config-source=xml::/etc/gconf/gconf.xml.local-defaults/ --direct --type=string --set /apps/metacity/general/theme 'Ia Ora Blue'",
-                                 "/usr/bin/gconftool-2 --config-source=xml::/etc/gconf/gconf.xml.local-defaults/ --direct --type=string --set /desktop/gnome/interface/gtk_theme 'Ia Ora Blue'",
+                                 #/usr/bin/gconftool-2 --config-source=xml::/etc/gconf/gconf.xml.local-defaults/ --direct --type=string --set /apps/metacity/general/theme 'Ia Ora Blue'",
+                                 #/usr/bin/gconftool-2 --config-source=xml::/etc/gconf/gconf.xml.local-defaults/ --direct --type=string --set /desktop/gnome/interface/gtk_theme 'Ia Ora Blue'",
                                  #- set blue gtk theme for Liveusb-Rw in GTK
                                  "perl -pi -e 's/META_CLASS=.*/META_CLASS=powerpack/' /etc/sysconfig/system",
                                  "echo MDV_MENU_STYLE=discovery > /etc/sysconfig/menustyle",
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' ],
diff --git a/config/settings-livecd.cfg b/config/settings-livecd.cfg
index cacbfdf..524dafa 100644
--- a/config/settings-livecd.cfg
+++ b/config/settings-livecd.cfg
@@ -11,7 +11,7 @@ region=int
 pack=
 name=Mageia
 product=LiveDVD
-version=4-RC
+version=4
 commercial=0
 default_user=live
 builddir=/home/draklive/var-data/build