Mga 5 Alpha1 configs

19 files changed, 29 insertions, 20 deletions

diff --git a/files/UEFI/GNOME/EFI/boot/bootx64.efi b/files/UEFI/GNOME/EFI/boot/bootx64.efi
index c5e1458..517dd1c 100644..100755
--- a/files/UEFI/GNOME/EFI/boot/bootx64.efi
+++ b/files/UEFI/GNOME/EFI/boot/bootx64.efi
diff --git a/files/UEFI/GNOME/boot/efiboot.img b/files/UEFI/GNOME/boot/efiboot.img
index 491c373..a1bfb74 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 0ac1597..24c86ad 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.1 Live
+title    Boot Mageia 5 (Cauldron) Live
 linux    /boot/vmlinuz
 initrd   /boot/cdrom/initrd.gz
-options  root=mgalive:LABEL=Mageia-4.1-GNOME-LiveDVD quiet rd.luks=0 rd.lvm=0 rd.md=0 rd.dm=0
+options  root=mgalive:LABEL=Mageia-5-alpha1-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 4e3e0fc..f2e63cb 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.1 Live
+title    Install Mageia 5 (Cauldron) Live
 linux    /boot/vmlinuz
 initrd   /boot/cdrom/initrd.gz
-options  root=mgalive:LABEL=Mageia-4.1-GNOME-LiveDVD quiet rd.luks=0 rd.lvm=0 rd.md=0 rd.dm=0 install
+options  root=mgalive:LABEL=Mageia-5-alpha1-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 a6e029b..4becbcd 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.1 Live (Safe mode)
+title    Boot Mageia 5 (Cauldron) Live (Safe mode)
 linux    /boot/vmlinuz
 initrd   /boot/cdrom/initrd.gz
-options  root=mgalive:LABEL=Mageia-4.1-GNOME-LiveDVD rd.luks=0 rd.lvm=0 rd.md=0 rd.dm=0 nokmsboot xdriver=vesa
+options  root=mgalive:LABEL=Mageia-5-alpha1-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 86c444f..70713c1 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.1 Live (from usb)
+title    Boot Mageia 5 (Cauldron) 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 e079a97..6602012 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.1 Live (from usb)
+title    Install Mageia 5 (Cauldron) 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 04239e7..7a74e20 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.1 Live (Safe mode, from usb)
+title    Boot Mageia 5 (Cauldron) 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/EFI/boot/bootx64.efi b/files/UEFI/KDE4/EFI/boot/bootx64.efi
index c5e1458..517dd1c 100644..100755
--- a/files/UEFI/KDE4/EFI/boot/bootx64.efi
+++ b/files/UEFI/KDE4/EFI/boot/bootx64.efi
diff --git a/files/UEFI/KDE4/boot/efiboot.img b/files/UEFI/KDE4/boot/efiboot.img
index a36adf1..964427d 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 a799fd1..3dd18da 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.1 Live
+title    Boot Mageia 5 (Cauldron) Live
 linux    /boot/vmlinuz
 initrd   /boot/cdrom/initrd.gz
-options  root=mgalive:LABEL=Mageia-4.1-KDE4-LiveDVD quiet rd.luks=0 rd.lvm=0 rd.md=0 rd.dm=0
+options  root=mgalive:LABEL=Mageia-5-alpha1-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 65d529f..8790c4a 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.1 Live
+title    Install Mageia 5 (Cauldron) Live
 linux    /boot/vmlinuz
 initrd   /boot/cdrom/initrd.gz
-options  root=mgalive:LABEL=Mageia-4.1-KDE4-LiveDVD quiet rd.luks=0 rd.lvm=0 rd.md=0 rd.dm=0 install
+options  root=mgalive:LABEL=Mageia-5-alpha1-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 e253f95..2f97842 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.1 Live (Safe mode)
+title    Boot Mageia 5 (Cauldron) Live (Safe mode)
 linux    /boot/vmlinuz
 initrd   /boot/cdrom/initrd.gz
-options  root=mgalive:LABEL=Mageia-4.1-KDE4-LiveDVD rd.luks=0 rd.lvm=0 rd.md=0 rd.dm=0 nokmsboot xdriver=vesa
+options  root=mgalive:LABEL=Mageia-5-alpha1-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 86c444f..70713c1 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.1 Live (from usb)
+title    Boot Mageia 5 (Cauldron) 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 e079a97..6602012 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.1 Live (from usb)
+title    Install Mageia 5 (Cauldron) 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 04239e7..7a74e20 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.1 Live (Safe mode, from usb)
+title    Boot Mageia 5 (Cauldron) 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 7da10b3..7449b50 100644
--- a/files/hacks/message
+++ b/files/hacks/message
diff --git a/files/mga_rpms/update_media.sh b/files/mga_rpms/update_media.sh
index fac618c..f0bca2d 100755
--- a/files/mga_rpms/update_media.sh
+++ b/files/mga_rpms/update_media.sh
@@ -21,6 +21,15 @@ cp $bcdmedia/x86_64/media/nonfree/release/broadcom-wl-kernel-desktop-latest-*.rp
 cp $bcdmedia/i586/media/core/release/broadcom-*-config-*.rpm i586/mga_rpms/core/
 cp $bcdmedia/x86_64/media/core/release/broadcom-*-config-*.rpm x86_64/mga_rpms/core/
 
+# nvidia-current
+cp $bcdmedia/i586/media/nonfree/release/nvidia-current-kernel-*-desktop586-*.rpm i586/mga_rpms/nonfree/
+cp $bcdmedia/i586/media/nonfree/release/nvidia-current-kernel-desktop586-latest-*.rpm i586/mga_rpms/nonfree/
+cp $bcdmedia/i586/media/nonfree/release/x11-driver-video-nvidia-current-*.rpm i586/mga_rpms/nonfree/
+
+cp $bcdmedia/x86_64/media/nonfree/release/nvidia-current-kernel-*-desktop-*.rpm x86_64/mga_rpms/nonfree/
+cp $bcdmedia/x86_64/media/nonfree/release/nvidia-current-kernel-desktop-latest-*.rpm x86_64/mga_rpms/nonfree/
+cp $bcdmedia/x86_64/media/nonfree/release/x11-driver-video-nvidia-current-*.rpm x86_64/mga_rpms/nonfree/
+
 # add grub2 stuff
 cp $bcdmedia/i586/media/core/release/grub2-2*.rpm i586/mga_rpms/core/
 cp $bcdmedia/i586/media/core/release/grub2-efi-2*.rpm i586/mga_rpms/core/
diff --git a/files/pkgs.pm b/files/pkgs.pm
index ee04188..ed3da31 100644
--- a/files/pkgs.pm
+++ b/files/pkgs.pm
@@ -1,4 +1,4 @@
-package pkgs; # $Id: pkgs.pm 269470 2010-05-26 09:23:39Z pterjan $
+package pkgs;
 
 
 
@@ -259,7 +259,7 @@ sub remove_unused_packages {
     undef $wait;
 
     # Packages to not remove even if they seem unused
-    my @wanted_hardware_packages = qw(gnome-bluetooth pulseaudio-module-bluetooth gnome-phone-manager bluedevil kppp ppp wireless-tools wpa_supplicant kernel-firmware-nonfree radeon-firmware ralink-firmware rtlwifi-firmware ipw2100-firmware ipw2200-firmware iwlwifi-3945-ucode iwlwifi-4965-ucode iwlwifi-agn-ucode b43-fwcutter b43-openfwwf atmel-firmware speedtouch-firmware zd1211-firmware isdn4k-utils rfkill);
+    my @wanted_hardware_packages = qw(gnome-bluetooth pulseaudio-module-bluetooth gnome-phone-manager bluedevil kppp ppp wireless-tools wpa_supplicant kernel-firmware-nonfree radeon-firmware ralink-firmware rtlwifi-firmware ipw2100-firmware ipw2200-firmware iwlwifi-3945-ucode iwlwifi-4965-ucode iwlwifi-agn-ucode b43-fwcutter b43-openfwwf atmel-firmware speedtouch-firmware zd1211-firmware isdn4k-utils rfkill x11-driver-input-wacom);
     @unused_hardware_packages = difference2(\@unused_hardware_packages, \@wanted_hardware_packages);
 
     @unused_hardware_packages || @unselected_locales or return;