Mga 4.1 configsdistro/mga4.1

30 files changed, 31 insertions, 24 deletions

diff --git a/config/auto_inst.cfg.pl b/config/auto_inst.cfg.pl
index 4f48f8c..e3b0da1 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\.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-/',
+	   if_($ENV{DRAKLIVE_ARCH} eq 'i586', '/^kernel-desktop-/', '/^fglrx-kernel-3\.12\.21-desktop-/', '/^nvidia-current-kernel-3\.12\.21-desktop-/', '/^nvidia304-kernel-3\.12\.21-desktop-', '/^nvidia173-kernel-3\.12\.21-desktop-/', '/^vboxadditions-kernel-3\.12\.21-desktop-/'),
+           '/^kernel-server-/', '/^fglrx-kernel-3\.12\.21-server-/', '/^nvidia-current-kernel-3\.12\.21-server-/', '/^nvidia304-kernel-3\.12\.21-server-/', '/^nvidia173-kernel-3\.12\.21-server-/', '/^vboxadditions-kernel-3\.12\.21-server-/',
 	   '/^broadcom-wl-/',
 	   
 	    if_($ENV{DRAKLIVE_PRODUCT} =~ /LiveCD/i, 'libreoffice-core'),
@@ -210,7 +210,7 @@ $o = {
            'flash-player-plugin',
            
            # xguest sucks
-           'xguest',
+           'xguest', 'apper',
            
            # not wanted (mga #9752)
            'al-anvar',
@@ -261,6 +261,8 @@ $o = {
 
            if_($has_gnome, 'gnome-shell', 'caribou', 'caribou-gtk3', 'brasero', 'gparted', 'gnome-classic-session',),
 
+           if_($has_kde4, 'kcm_touchpad',),
+
            if_($ENV{DRAKLIVE_PRODUCT} =~ /liveusb-rw/i,
                'samba-client',
                'RealPlayer', 'RealPlayer-rpnp',
diff --git a/config/live.cfg b/config/live.cfg
index 5b8b4cb..f320962 100644
--- a/config/live.cfg
+++ b/config/live.cfg
@@ -298,6 +298,7 @@ my $_l = {
 			    # FIXME: add doc and autorun
 			    #[ 'extra/livecd/autorun/*', ''],
 			    #map { [ 'extra/livecd/' . $_, $_ ] } qw(LISEZMOI.pdf README.pdf) 
+			    [ 'files/isolinux/CD/*', 'isolinux/' ],
 			 ],
             ),
             if_($live->{settings}{product} =~ /LiveDVD/i,
@@ -316,8 +317,12 @@ my $_l = {
 			    # FIXME: add doc and autorun
 			    #[ 'extra/livecd/autorun/*', ''],
 			    #map { [ 'extra/livecd/' . $_, $_ ] } qw(LISEZMOI.pdf README.pdf) 
+			    [ 'files/isolinux/DVD/*', 'isolinux/' ],
 			 ],
             ),
+
+	
+
         },
         #extra_media => [ { storage => 'usb' } ],
         mount => MDV::Draklive::Mounts::volatile_squash_union($use_modules),
diff --git a/config/settings-livecd.cfg b/config/settings-livecd.cfg
index 524dafa..feebdae 100644
--- a/config/settings-livecd.cfg
+++ b/config/settings-livecd.cfg
@@ -1,5 +1,5 @@
 #repository=/distrib/mageia/distrib/cauldron
-repository=/home/bcd/build_bcd/pieces/cauldron
+repository=/home/bcd/build_bcd/pieces/4
 #repository=/home/draklive/distrib/cauldron
 # updates_repository=/distrib/mageia/distrib/cauldron
 # updates_repository=/home/bcd/build_bcd/pieces/cauldron
@@ -7,11 +7,11 @@ additional_repository=
 arch=i586
 desktop=KDE4
 media=DVD
-region=int
+region=all
 pack=
 name=Mageia
 product=LiveDVD
-version=4
+version=4.1
 commercial=0
 default_user=live
 builddir=/home/draklive/var-data/build
diff --git a/files/UEFI/GNOME/boot/efiboot.img b/files/UEFI/GNOME/boot/efiboot.img
index b513d98..491c373 100644
--- a/files/UEFI/GNOME/boot/efiboot.img
+++ b/files/UEFI/GNOME/boot/efiboot.img
diff --git a/files/UEFI/GNOME/loader/entries/01-mga-boot.conf b/files/UEFI/GNOME/loader/entries/01-mga-boot.conf
index 26fcb20..0ac1597 100644
--- a/files/UEFI/GNOME/loader/entries/01-mga-boot.conf
+++ b/files/UEFI/GNOME/loader/entries/01-mga-boot.conf
@@ -1,4 +1,4 @@
-title    Boot Mageia 4 Live
+title    Boot Mageia 4.1 Live
 linux    /boot/vmlinuz
 initrd   /boot/cdrom/initrd.gz
-options  root=mgalive:LABEL=Mageia-4-GNOME-LiveDVD quiet rd.luks=0 rd.lvm=0 rd.md=0 rd.dm=0
+options  root=mgalive:LABEL=Mageia-4.1-GNOME-LiveDVD quiet rd.luks=0 rd.lvm=0 rd.md=0 rd.dm=0
diff --git a/files/UEFI/GNOME/loader/entries/02-mga-install.conf b/files/UEFI/GNOME/loader/entries/02-mga-install.conf
index f107d32..4e3e0fc 100644
--- a/files/UEFI/GNOME/loader/entries/02-mga-install.conf
+++ b/files/UEFI/GNOME/loader/entries/02-mga-install.conf
@@ -1,4 +1,4 @@
-title    Install Mageia 4 Live
+title    Install Mageia 4.1 Live
 linux    /boot/vmlinuz
 initrd   /boot/cdrom/initrd.gz
-options  root=mgalive:LABEL=Mageia-4-GNOME-LiveDVD quiet rd.luks=0 rd.lvm=0 rd.md=0 rd.dm=0 install
+options  root=mgalive:LABEL=Mageia-4.1-GNOME-LiveDVD quiet rd.luks=0 rd.lvm=0 rd.md=0 rd.dm=0 install
diff --git a/files/UEFI/GNOME/loader/entries/03-mga-boot-safe.conf b/files/UEFI/GNOME/loader/entries/03-mga-boot-safe.conf
index d99424a..a6e029b 100644
--- a/files/UEFI/GNOME/loader/entries/03-mga-boot-safe.conf
+++ b/files/UEFI/GNOME/loader/entries/03-mga-boot-safe.conf
@@ -1,4 +1,4 @@
-title    Boot Mageia 4 Live (Safe mode)
+title    Boot Mageia 4.1 Live (Safe mode)
 linux    /boot/vmlinuz
 initrd   /boot/cdrom/initrd.gz
-options  root=mgalive:LABEL=Mageia-4-GNOME-LiveDVD rd.luks=0 rd.lvm=0 rd.md=0 rd.dm=0 nokmsboot xdriver=vesa
+options  root=mgalive:LABEL=Mageia-4.1-GNOME-LiveDVD rd.luks=0 rd.lvm=0 rd.md=0 rd.dm=0 nokmsboot xdriver=vesa
diff --git a/files/UEFI/GNOME/loader/entries/04-mga-usb-boot.conf b/files/UEFI/GNOME/loader/entries/04-mga-usb-boot.conf
index 3f661fc..86c444f 100644
--- a/files/UEFI/GNOME/loader/entries/04-mga-usb-boot.conf
+++ b/files/UEFI/GNOME/loader/entries/04-mga-usb-boot.conf
@@ -1,4 +1,4 @@
-title    Boot Mageia 4 Live (from usb)
+title    Boot Mageia 4.1 Live (from usb)
 linux    /boot/vmlinuz
 initrd   /boot/cdrom/initrd.gz
 options  root=mgalive:LABEL=MGALIVE UEFI quiet rd.luks=0 rd.lvm=0 rd.md=0 rd.dm=0
diff --git a/files/UEFI/GNOME/loader/entries/05-mga-usb-install.conf b/files/UEFI/GNOME/loader/entries/05-mga-usb-install.conf
index 825bf6f..e079a97 100644
--- a/files/UEFI/GNOME/loader/entries/05-mga-usb-install.conf
+++ b/files/UEFI/GNOME/loader/entries/05-mga-usb-install.conf
@@ -1,4 +1,4 @@
-title    Install Mageia 4 Live (from usb)
+title    Install Mageia 4.1 Live (from usb)
 linux    /boot/vmlinuz
 initrd   /boot/cdrom/initrd.gz
 options  root=mgalive:LABEL=MGALIVE UEFI quiet rd.luks=0 rd.lvm=0 rd.md=0 rd.dm=0 install
diff --git a/files/UEFI/GNOME/loader/entries/06-mga-usb-boot-safe.conf b/files/UEFI/GNOME/loader/entries/06-mga-usb-boot-safe.conf
index 28b2cda..04239e7 100644
--- a/files/UEFI/GNOME/loader/entries/06-mga-usb-boot-safe.conf
+++ b/files/UEFI/GNOME/loader/entries/06-mga-usb-boot-safe.conf
@@ -1,4 +1,4 @@
-title    Boot Mageia 4 Live (Safe mode, from usb)
+title    Boot Mageia 4.1 Live (Safe mode, from usb)
 linux    /boot/vmlinuz
 initrd   /boot/cdrom/initrd.gz
 options  root=mgalive:LABEL=MGALIVE UEFI rd.luks=0 rd.lvm=0 rd.md=0 rd.dm=0 nokmsboot xdriver=vesa
diff --git a/files/UEFI/KDE4/boot/efiboot.img b/files/UEFI/KDE4/boot/efiboot.img
index 5a4e7e4..a36adf1 100644
--- a/files/UEFI/KDE4/boot/efiboot.img
+++ b/files/UEFI/KDE4/boot/efiboot.img
diff --git a/files/UEFI/KDE4/loader/entries/01-mga-boot.conf b/files/UEFI/KDE4/loader/entries/01-mga-boot.conf
index 9fda6b7..a799fd1 100644
--- a/files/UEFI/KDE4/loader/entries/01-mga-boot.conf
+++ b/files/UEFI/KDE4/loader/entries/01-mga-boot.conf
@@ -1,4 +1,4 @@
-title    Boot Mageia 4 Live
+title    Boot Mageia 4.1 Live
 linux    /boot/vmlinuz
 initrd   /boot/cdrom/initrd.gz
-options  root=mgalive:LABEL=Mageia-4-KDE4-LiveDVD quiet rd.luks=0 rd.lvm=0 rd.md=0 rd.dm=0
+options  root=mgalive:LABEL=Mageia-4.1-KDE4-LiveDVD quiet rd.luks=0 rd.lvm=0 rd.md=0 rd.dm=0
diff --git a/files/UEFI/KDE4/loader/entries/02-mga-install.conf b/files/UEFI/KDE4/loader/entries/02-mga-install.conf
index f340e6b..65d529f 100644
--- a/files/UEFI/KDE4/loader/entries/02-mga-install.conf
+++ b/files/UEFI/KDE4/loader/entries/02-mga-install.conf
@@ -1,4 +1,4 @@
-title    Install Mageia 4 Live
+title    Install Mageia 4.1 Live
 linux    /boot/vmlinuz
 initrd   /boot/cdrom/initrd.gz
-options  root=mgalive:LABEL=Mageia-4-KDE4-LiveDVD quiet rd.luks=0 rd.lvm=0 rd.md=0 rd.dm=0 install
+options  root=mgalive:LABEL=Mageia-4.1-KDE4-LiveDVD quiet rd.luks=0 rd.lvm=0 rd.md=0 rd.dm=0 install
diff --git a/files/UEFI/KDE4/loader/entries/03-mga-boot-safe.conf b/files/UEFI/KDE4/loader/entries/03-mga-boot-safe.conf
index 158d1b7..e253f95 100644
--- a/files/UEFI/KDE4/loader/entries/03-mga-boot-safe.conf
+++ b/files/UEFI/KDE4/loader/entries/03-mga-boot-safe.conf
@@ -1,4 +1,4 @@
-title    Boot Mageia 4 Live (Safe mode)
+title    Boot Mageia 4.1 Live (Safe mode)
 linux    /boot/vmlinuz
 initrd   /boot/cdrom/initrd.gz
-options  root=mgalive:LABEL=Mageia-4-KDE4-LiveDVD rd.luks=0 rd.lvm=0 rd.md=0 rd.dm=0 nokmsboot xdriver=vesa
+options  root=mgalive:LABEL=Mageia-4.1-KDE4-LiveDVD rd.luks=0 rd.lvm=0 rd.md=0 rd.dm=0 nokmsboot xdriver=vesa
diff --git a/files/UEFI/KDE4/loader/entries/04-mga-usb-boot.conf b/files/UEFI/KDE4/loader/entries/04-mga-usb-boot.conf
index 3f661fc..86c444f 100644
--- a/files/UEFI/KDE4/loader/entries/04-mga-usb-boot.conf
+++ b/files/UEFI/KDE4/loader/entries/04-mga-usb-boot.conf
@@ -1,4 +1,4 @@
-title    Boot Mageia 4 Live (from usb)
+title    Boot Mageia 4.1 Live (from usb)
 linux    /boot/vmlinuz
 initrd   /boot/cdrom/initrd.gz
 options  root=mgalive:LABEL=MGALIVE UEFI quiet rd.luks=0 rd.lvm=0 rd.md=0 rd.dm=0
diff --git a/files/UEFI/KDE4/loader/entries/05-mga-usb-install.conf b/files/UEFI/KDE4/loader/entries/05-mga-usb-install.conf
index 825bf6f..e079a97 100644
--- a/files/UEFI/KDE4/loader/entries/05-mga-usb-install.conf
+++ b/files/UEFI/KDE4/loader/entries/05-mga-usb-install.conf
@@ -1,4 +1,4 @@
-title    Install Mageia 4 Live (from usb)
+title    Install Mageia 4.1 Live (from usb)
 linux    /boot/vmlinuz
 initrd   /boot/cdrom/initrd.gz
 options  root=mgalive:LABEL=MGALIVE UEFI quiet rd.luks=0 rd.lvm=0 rd.md=0 rd.dm=0 install
diff --git a/files/UEFI/KDE4/loader/entries/06-mga-usb-boot-safe.conf b/files/UEFI/KDE4/loader/entries/06-mga-usb-boot-safe.conf
index 28b2cda..04239e7 100644
--- a/files/UEFI/KDE4/loader/entries/06-mga-usb-boot-safe.conf
+++ b/files/UEFI/KDE4/loader/entries/06-mga-usb-boot-safe.conf
@@ -1,4 +1,4 @@
-title    Boot Mageia 4 Live (Safe mode, from usb)
+title    Boot Mageia 4.1 Live (Safe mode, from usb)
 linux    /boot/vmlinuz
 initrd   /boot/cdrom/initrd.gz
 options  root=mgalive:LABEL=MGALIVE UEFI rd.luks=0 rd.lvm=0 rd.md=0 rd.dm=0 nokmsboot xdriver=vesa
diff --git a/files/hacks/message b/files/hacks/message
index fce8dda..7da10b3 100644
--- a/files/hacks/message
+++ b/files/hacks/message
diff --git a/files/isolinux/CD/gfxboot.com b/files/isolinux/CD/gfxboot.com
new file mode 100644
index 0000000..b4b80b8
--- /dev/null
+++ b/files/isolinux/CD/gfxboot.com
diff --git a/files/isolinux/CD/ldlinux.c32 b/files/isolinux/CD/ldlinux.c32
new file mode 100644
index 0000000..54c0bca
--- /dev/null
+++ b/files/isolinux/CD/ldlinux.c32
diff --git a/files/isolinux/CD/libcom32.c32 b/files/isolinux/CD/libcom32.c32
new file mode 100644
index 0000000..fa187ba
--- /dev/null
+++ b/files/isolinux/CD/libcom32.c32
diff --git a/files/isolinux/CD/libgpl.c32 b/files/isolinux/CD/libgpl.c32
new file mode 100644
index 0000000..2f6c4c3
--- /dev/null
+++ b/files/isolinux/CD/libgpl.c32
diff --git a/files/isolinux/CD/libmenu.c32 b/files/isolinux/CD/libmenu.c32
new file mode 100644
index 0000000..5169a3e
--- /dev/null
+++ b/files/isolinux/CD/libmenu.c32
diff --git a/files/isolinux/CD/libutil.c32 b/files/isolinux/CD/libutil.c32
new file mode 100644
index 0000000..8bdc4b1
--- /dev/null
+++ b/files/isolinux/CD/libutil.c32
diff --git a/files/isolinux/DVD/gfxboot.com b/files/isolinux/DVD/gfxboot.com
new file mode 100644
index 0000000..b4b80b8
--- /dev/null
+++ b/files/isolinux/DVD/gfxboot.com
diff --git a/files/isolinux/DVD/ldlinux.c32 b/files/isolinux/DVD/ldlinux.c32
new file mode 100644
index 0000000..54c0bca
--- /dev/null
+++ b/files/isolinux/DVD/ldlinux.c32
diff --git a/files/isolinux/DVD/libcom32.c32 b/files/isolinux/DVD/libcom32.c32
new file mode 100644
index 0000000..fa187ba
--- /dev/null
+++ b/files/isolinux/DVD/libcom32.c32
diff --git a/files/isolinux/DVD/libgpl.c32 b/files/isolinux/DVD/libgpl.c32
new file mode 100644
index 0000000..2f6c4c3
--- /dev/null
+++ b/files/isolinux/DVD/libgpl.c32
diff --git a/files/isolinux/DVD/libmenu.c32 b/files/isolinux/DVD/libmenu.c32
new file mode 100644
index 0000000..5169a3e
--- /dev/null
+++ b/files/isolinux/DVD/libmenu.c32
diff --git a/files/isolinux/DVD/libutil.c32 b/files/isolinux/DVD/libutil.c32
new file mode 100644
index 0000000..8bdc4b1
--- /dev/null
+++ b/files/isolinux/DVD/libutil.c32