From b67df736b3443c0b0841c8da7f15ad5643ce8ca3 Mon Sep 17 00:00:00 2001
From: Thomas Backlund <tmb@mageia.org>
Date: Sat, 4 Jan 2014 20:39:28 +0100
Subject: add mga3 final build configs

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

(limited to 'config/live.cfg')

diff --git a/config/live.cfg b/config/live.cfg
index 3f9ff82..b824763 100644
--- a/config/live.cfg
+++ b/config/live.cfg
@@ -45,6 +45,21 @@ my $_l = {
 		[ 'files/register.desktop', '/home/live/Desktop/register.desktop', { mode => 0755 } ],
 		[ 'files/01_gsettings-desktop-schemas.gschema.override', '/usr/share/glib-2.0/schemas/01_gsettings-desktop-schemas.gschema.override', { mode => 0644, no_install => 1 } ],
             ),
+            # 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 } ],
+
+            # add local repos
+            if_($live->{settings}{arch} eq 'i586',
+            [ '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' ],
+            ),
+            # default to grub legacy
+            [ 'files/bootloader.pm', '/usr/lib/libDrakX/bootloader.pm', { mode => 0644 } ],
             # 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 } ],
             #- make cups the default spooler
@@ -65,6 +80,10 @@ my $_l = {
             #- disable speedboot for first boot after disk installation
             [ 'files/draklive-install.d/remove.d/disable-speedboot', '/etc/draklive-install.d/remove.d/disable-speedboot', { mode => 0644 } ],
 
+            # copy mgalive fix for installer progress bar
+            [ 'files/90mgalive/mgalive-root.sh', '/usr/lib/dracut/modules.d/90mgalive/mgalive-root.sh', { mode => 0755 } ],
+            [ 'files/draklive-install', '/usr/sbin/draklive-install', { mode => 0755 } ],
+
 	    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 } ]),
             #- sysconfig files for first boot
@@ -175,7 +194,7 @@ my $_l = {
                             #-   FIXME: test with live USB r/w
                             #"chrpath -d /usr/lib/ooo-${ooo_version}/program/soffice.bin",
                             #- workaround rpm bug that leaves a corrupted rpm DB in chroot
-                            "rm -f /var/lib/rpm/__db.*",
+                            #"rm -f /var/lib/rpm/__db.*",
 			    "rm -f /.readahead_collect",
                             #- adduser seems to create a sparse lastlog with a slot for all available users
                             #- which can be huge
@@ -196,6 +215,13 @@ my $_l = {
 			    #),
 
                             "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",
+
+                            #grub2
+                            "urpmi --auto grub2 ||:",
                         ),
         additional_media => [
           if_($live->{settings}{updates_repository},
@@ -224,7 +250,7 @@ my $_l = {
     },
     regions => {
         #- the "all" region has a magical behavior and selects all langs
-        int => [qw(de en es fr it pl pt_BR ru)],
+        int => [qw(en)],
         guadec => [qw(de en es fr it nb nn nl pl pt_BR ro ru tr)],
         'Europe-Americas' => [qw(bg cs da de el en es et fi fr hr hu it ky lt lv nb nl nn no pl pt pt_BR ro ru sv tr uk uz)],
         #'africa-asia' => [qw(de en es fr it nb nn nl pl pt_BR ro ru tr ar he hi id ko ms zu ja zh_CN zh_TW)],
@@ -248,6 +274,22 @@ my $_l = {
                 pre => [ 'for i in seq 1 5; do showlabels --removable | grep '.build_one_label($live).'; if [ $? -eq 0 ]; then break; fi; sleep 1; done' ],
                 extra_modules => [ qw(vfat sd_mod usb_storage uhci_hcd ohci_hcd ehci_hcd xhci_hcd) ],
                 files => [
+            		 if_($live->{settings}{arch} eq 'x86_64',
+            		     [ 'files/UEFI/*', '' ],
+            		 ),
+			    # FIXME: add doc and autorun
+			    #[ 'extra/livecd/autorun/*', ''],
+			    #map { [ 'extra/livecd/' . $_, $_ ] } qw(LISEZMOI.pdf README.pdf) 
+			 ],
+            ),
+            if_($live->{settings}{product} =~ /LiveDVD/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' ],
+                extra_modules => [ qw(vfat sd_mod usb_storage uhci_hcd ohci_hcd ehci_hcd xhci_hcd) ],
+                files => [
+            		 if_($live->{settings}{arch} eq 'x86_64',
+            		     [ 'files/UEFI/*', '' ],
+            		 ),
 			    # FIXME: add doc and autorun
 			    #[ 'extra/livecd/autorun/*', ''],
 			    #map { [ 'extra/livecd/' . $_, $_ ] } qw(LISEZMOI.pdf README.pdf) 
-- 
cgit v1.2.1