add mga4-alpha1 configs

3 files changed, 27 insertions, 11 deletions

diff --git a/config/auto_inst.cfg.pl b/config/auto_inst.cfg.pl
index 29d4a73..4c5fca7 100644
--- a/config/auto_inst.cfg.pl
+++ b/config/auto_inst.cfg.pl
@@ -86,7 +86,8 @@ $o = {
                '/^lib64atlas3-/',
            ),
 	    if_($ENV{DRAKLIVE_ARCH} eq 'i586',
-	        '/^libatlas3-/',),
+	        '/^libatlas3-/',
+	    ),
 
            if_($ENV{DRAKLIVE_PRODUCT} !~ /gaming/i, #- non-DVD products
                #- from task-kde Suggests
@@ -198,9 +199,10 @@ $o = {
            'mono',
 
 	   # block the kernels we dont want
-	    if_($ENV{DRAKLIVE_ARCH} eq 'i586', '/^kernel-desktop-/', 'fglrx-kernel-3.8.13-desktop-1.mga3', 'nvidia-current-kernel-3.8.13-desktop-1.mga3', 'nvidia304-kernel-3.8.13-desktop-1.mga3', 'nvidia173-kernel-3.8.13-desktop-1.mga3', 'vboxadditions-kernel-3.8.13-desktop-1.mga3'),
-           '/^kernel-server-/', 'fglrx-kernel-3.8.13-server-1.mga3', 'nvidia-current-kernel-3.8.13-server-1.mga3', 'nvidia304-kernel-3.8.13-server-1.mga3', 'nvidia173-kernel-3.8.13-server-1.mga3', 'vboxadditions-kernel-3.8.13-server-1.mga3',
+	   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',
 
 	   # not needed anymore (mga #2001)
 	   'nspluginwrapper',
@@ -229,11 +231,16 @@ $o = {
 
            if_($has_moblin, 'task-moblin'),
 
-           if_($ENV{DRAKLIVE_ARCH} eq 'i586', 'libcanberra-gtk0', 'fglrx-kernel-3.8.13-desktop586-1.mga3', 'nvidia-current-kernel-3.8.13-desktop586-1.mga3', 'nvidia304-kernel-3.8.13-desktop586-1.mga3', 'nvidia173-kernel-3.8.13-desktop586-1.mga3', 'vboxadditions-kernel-3.8.13-desktop586-1.mga3'),
-           if_($ENV{DRAKLIVE_ARCH} eq 'x86_64', 'lib64canberra-gtk0', 'fglrx-kernel-3.8.13-desktop-1.mga3', 'nvidia-current-kernel-3.8.13-desktop-1.mga3', 'nvidia304-kernel-3.8.13-desktop-1.mga3', 'nvidia173-kernel-3.8.13-desktop-1.mga3', 'vboxadditions-kernel-3.8.13-desktop-1.mga3', 'gummiboot'),
+	   # do we still need ?
+           #if_($ENV{DRAKLIVE_ARCH} eq 'i586', 'libcanberra-gtk0'),
+           #if_($ENV{DRAKLIVE_ARCH} eq 'x86_64', 'lib64canberra-gtk0'),
+
+           if_($ENV{DRAKLIVE_ARCH} eq 'i586', 'fglrx-kernel-desktop586-latest', 'nvidia-current-kernel-desktop586-latest', 'nvidia304-kernel-desktop586-latest', 'nvidia173-kernel-desktop586-latest', 'vboxadditions-kernel-desktop586-latest'),
+           if_($ENV{DRAKLIVE_ARCH} eq 'x86_64', 'fglrx-kernel-desktop-latest', 'nvidia-current-kernel-desktop-latest', 'nvidia304-kernel-desktop-latest', 'nvidia173-kernel-desktop-latest', 'vboxadditions-kernel-desktop-latest', 'gummiboot'),
 
 	   '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',
 	   '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',
diff --git a/config/live.cfg b/config/live.cfg
index b824763..dedf7c8 100644
--- a/config/live.cfg
+++ b/config/live.cfg
@@ -41,8 +41,8 @@ my $_l = {
             ),
 	    # fix gnome-shell not showing draklive-install and register icons on desktop in live mode
 	    if_($live->{settings}{desktop} eq 'GNOME',
-		[ 'files/draklive-install.desktop', '/home/live/Desktop/draklive-install.desktop', { mode => 0755, no_install => 1 } ],
-		[ 'files/register.desktop', '/home/live/Desktop/register.desktop', { mode => 0755 } ],
+		#[ 'files/draklive-install.desktop', '/home/live/Desktop/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 } ],
             ),
             # blacklist pata_acpi
@@ -50,6 +50,10 @@ my $_l = {
 
 	    # lock bluedevil, radeon-firmware, kernel-firnware-nonfree
             [ '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 } ],
 
             # add local repos
             if_($live->{settings}{arch} eq 'i586',
@@ -72,6 +76,8 @@ 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 } ],
@@ -82,10 +88,13 @@ my $_l = {
 
             # copy mgalive fix for installer progress bar
             [ 'files/90mgalive/mgalive-root.sh', '/usr/lib/dracut/modules.d/90mgalive/mgalive-root.sh', { mode => 0755 } ],
+            [ 'files/90mgalive/module-setup.sh', '/usr/lib/dracut/modules.d/90mgalive/module-setup.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 } ]),
+	    #if_($live->{settings}{desktop} eq 'GNOME',
+	#	[ 'files/draklive-install.d/run.d/gsettings.sh', '/etc/draklive-install.d/run.d/gsettings.sh', { mode => 755 } ]),
             #- sysconfig files for first boot
             [ $live->{settings}{media} eq 'usb' ?
                 "files/finish-install.$live->{settings}{media}" :
@@ -261,7 +270,7 @@ my $_l = {
         'Asia-no-India' => [qw(id ja ko th vi zh_CN zh_TW)],
     },
     packs => {
-        int => [ map { "i18n-$_" } qw(de en es fi fr it nl pt sv) ],
+        int => [ map { "i18n-$_" } qw(en) ],
         da => [ map { "i18n-$_" } qw(da en) ],
     },
     if_(member($live->{settings}{media}, 'CD', 'DVD'),
diff --git a/config/settings-livecd.cfg b/config/settings-livecd.cfg
index 04e1d0b..95fce2a 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=CD
+media=DVD
 region=int
 pack=
 name=Mageia
-product=LiveCD
-version=3
+product=LiveDVD
+version=4-alpha1
 commercial=0
 default_user=live
 builddir=/home/draklive/var-data/build