add mga4-alpha2 configs

3 files changed, 15 insertions, 16 deletions

diff --git a/config/auto_inst.cfg.pl b/config/auto_inst.cfg.pl
index 4c5fca7..24968d6 100644
--- a/config/auto_inst.cfg.pl
+++ b/config/auto_inst.cfg.pl
@@ -152,9 +152,9 @@ $o = {
                 	'gnome-packagekit-common', 'gnome-keyring',
                    ),
                ),
-               ($ENV{DRAKLIVE_PRODUCT} =~ /liveusb-rw/i
-                ? ('/openjdk/', 'java-1.5.0-gcj')
-                : '/java(?!scriptcoregtk\d+)/'),
+               #($ENV{DRAKLIVE_PRODUCT} =~ /liveusb-rw/i
+                #? ('/openjdk/', 'java-1.5.0-gcj')
+                #: '/java(?!scriptcoregtk\d+)/'),
                'asihpi-firmware', 'hdsploader', 'mixartloader', 'pcxhrloader', 'usx2yloader', 'vxloader',
                'drakfax', 'efax',
            ),
@@ -202,7 +202,8 @@ $o = {
 	   if_($ENV{DRAKLIVE_ARCH} eq 'i586', '/^kernel-desktop-/', '/^fglrx-kernel-*-desktop-/', '/^nvidia-current-kernel-*-desktop-/', '/^nvidia304-kernel-*-desktop-', '/^nvidia173-kernel-*-desktop-/', '/^vboxadditions-kernel-*-desktop-/'),
            '/^kernel-server-/', '/^fglrx-kernel-*-server-/', '/^nvidia-current-kernel-*-server-/', '/^nvidia304-kernel-*-server-/', '/^nvidia173-kernel-*-server-/', '/^vboxadditions-kernel-*-server-/',
 	   '/^broadcom-wl-/',
-	   #'libreoffice-core',
+	   
+	    if_($ENV{DRAKLIVE_PRODUCT} =~ /LiveCD/i, 'libreoffice-core'),
 
 	   # not needed anymore (mga #2001)
 	   'nspluginwrapper',
@@ -240,7 +241,7 @@ $o = {
 
 	   'x11-server-common', 'x11-driver-video-fglrx', 'x11-driver-video-nvidia-current', 'x11-driver-video-nvidia173', 'x11-driver-video-nvidia304', 'x11-driver-video-vboxvideo',
 
-	   'basesystem',
+	   'basesystem', 'bluez-firmware',
 	   'usbutils', # we want lsusb
 	   'shared-mime-info', # needed for .desktop files to work atleast in gnome
 	   'dmraid', 'mdadm', 'mc', 'btrfs-progs', 'shorewall-ipv6', 'parted', 'glxinfo', 'patch',
@@ -253,7 +254,7 @@ $o = {
 
            if_($ENV{DRAKLIVE_PRODUCT} =~ /gaming/i, 'task-games'),
 
-           if_($has_gnome, 'gnome-shell', 'caribou', 'caribou-gtk3', 'gparted',),#, 'ibus-ui-gtk3'),
+           if_($has_gnome, 'gnome-shell', 'caribou', 'caribou-gtk3', 'gparted', ),#, 'ibus-ui-gtk3'),
 
            if_($ENV{DRAKLIVE_PRODUCT} =~ /liveusb-rw/i,
                'samba-client',
diff --git a/config/live.cfg b/config/live.cfg
index dedf7c8..d1f9a2a 100644
--- a/config/live.cfg
+++ b/config/live.cfg
@@ -49,11 +49,11 @@ my $_l = {
             [ '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 } ],
+            #[ 'files/pkgs.pm', '/usr/lib/libDrakX/pkgs.pm', { mode => 0644 } ],
             
             # shorewall fixes
-            [ 'files/shorewall-interfaces', '/etc/shorewall/interfaces', { mode => 0644 } ],
-            [ 'files/shorewall6-interfaces', '/etc/shorewall6/interfaces', { mode => 0644 } ],
+            #[ 'files/shorewall-interfaces', '/etc/shorewall/interfaces', { mode => 0644 } ],
+            #[ 'files/shorewall6-interfaces', '/etc/shorewall6/interfaces', { mode => 0644 } ],
 
             # add local repos
             if_($live->{settings}{arch} eq 'i586',
@@ -63,7 +63,7 @@ my $_l = {
             [ '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 } ],
+            #[ '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
@@ -76,8 +76,6 @@ 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 } ],
-                # dracut fix
-                [ 'files/dracut-functions.sh', '/usr/lib/dracut/dracut-functions.sh', { mode => 0755 } ],
             ),
             #- disable first boot wizard at live boot
             [ 'files/firstboot', '/etc/sysconfig/firstboot', { mode => 0644 } ],
diff --git a/config/settings-livecd.cfg b/config/settings-livecd.cfg
index 95fce2a..94d3e1a 100644
--- a/config/settings-livecd.cfg
+++ b/config/settings-livecd.cfg
@@ -5,12 +5,12 @@ repository=/home/bcd/build_bcd/pieces/cauldron
 additional_repository=
 arch=i586
 desktop=KDE4
-media=DVD
-region=int
+media=CD
+region=all
 pack=
 name=Mageia
-product=LiveDVD
-version=4-alpha1
+product=LiveCD
+version=4-alpha2
 commercial=0
 default_user=live
 builddir=/home/draklive/var-data/build