summaryrefslogtreecommitdiffstats
path: root/files
diff options
context:
space:
mode:
authorThomas Backlund <tmb@mageia.org>2014-08-31 14:45:48 +0200
committerThomas Backlund <tmb@mageia.org>2014-08-31 14:45:48 +0200
commit51937652b5cba362e5d9f5fd7dcacb6bcea372e3 (patch)
tree95ffc458916acfa89ff3487ef13b70453dc8b639 /files
parent3d1403b296827ff2a90a500c8e3eb9ecadcfe233 (diff)
downloaddraklive-config-51937652b5cba362e5d9f5fd7dcacb6bcea372e3.tar
draklive-config-51937652b5cba362e5d9f5fd7dcacb6bcea372e3.tar.gz
draklive-config-51937652b5cba362e5d9f5fd7dcacb6bcea372e3.tar.bz2
draklive-config-51937652b5cba362e5d9f5fd7dcacb6bcea372e3.tar.xz
draklive-config-51937652b5cba362e5d9f5fd7dcacb6bcea372e3.zip
Mga 5 Alpha2 configs
Diffstat (limited to 'files')
-rw-r--r--files/UEFI/GNOME/boot/efiboot.imgbin18874368 -> 23068672 bytes
-rw-r--r--files/UEFI/GNOME/loader/entries/01-mga-boot.conf2
-rw-r--r--files/UEFI/GNOME/loader/entries/02-mga-install.conf2
-rw-r--r--files/UEFI/GNOME/loader/entries/03-mga-boot-safe.conf2
-rw-r--r--files/UEFI/KDE4/boot/efiboot.imgbin18874368 -> 23068672 bytes
-rw-r--r--files/UEFI/KDE4/loader/entries/01-mga-boot.conf2
-rw-r--r--files/UEFI/KDE4/loader/entries/02-mga-install.conf2
-rw-r--r--files/UEFI/KDE4/loader/entries/03-mga-boot-safe.conf2
-rwxr-xr-x[-rw-r--r--]files/hacks/messagebin537088 -> 537088 bytes
-rwxr-xr-xfiles/mga_rpms/update_media.sh28
10 files changed, 20 insertions, 20 deletions
diff --git a/files/UEFI/GNOME/boot/efiboot.img b/files/UEFI/GNOME/boot/efiboot.img
index a1bfb74..e9d71b7 100644
--- a/files/UEFI/GNOME/boot/efiboot.img
+++ b/files/UEFI/GNOME/boot/efiboot.img
Binary files differ
diff --git a/files/UEFI/GNOME/loader/entries/01-mga-boot.conf b/files/UEFI/GNOME/loader/entries/01-mga-boot.conf
index 24c86ad..f8adacd 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 5 (Cauldron) Live
linux /boot/vmlinuz
initrd /boot/cdrom/initrd.gz
-options root=mgalive:LABEL=Mageia-5-alpha1-GNOME-LiveDVD quiet rd.luks=0 rd.lvm=0 rd.md=0 rd.dm=0
+options root=mgalive:LABEL=Mageia-5-alpha2-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 f2e63cb..917eab4 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 5 (Cauldron) Live
linux /boot/vmlinuz
initrd /boot/cdrom/initrd.gz
-options root=mgalive:LABEL=Mageia-5-alpha1-GNOME-LiveDVD quiet rd.luks=0 rd.lvm=0 rd.md=0 rd.dm=0 install
+options root=mgalive:LABEL=Mageia-5-alpha2-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 4becbcd..cffcafc 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 5 (Cauldron) Live (Safe mode)
linux /boot/vmlinuz
initrd /boot/cdrom/initrd.gz
-options root=mgalive:LABEL=Mageia-5-alpha1-GNOME-LiveDVD rd.luks=0 rd.lvm=0 rd.md=0 rd.dm=0 nokmsboot xdriver=vesa
+options root=mgalive:LABEL=Mageia-5-alpha2-GNOME-LiveDVD 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 964427d..3369228 100644
--- a/files/UEFI/KDE4/boot/efiboot.img
+++ b/files/UEFI/KDE4/boot/efiboot.img
Binary files differ
diff --git a/files/UEFI/KDE4/loader/entries/01-mga-boot.conf b/files/UEFI/KDE4/loader/entries/01-mga-boot.conf
index 3dd18da..aa13b2a 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 5 (Cauldron) Live
linux /boot/vmlinuz
initrd /boot/cdrom/initrd.gz
-options root=mgalive:LABEL=Mageia-5-alpha1-KDE4-LiveDVD quiet rd.luks=0 rd.lvm=0 rd.md=0 rd.dm=0
+options root=mgalive:LABEL=Mageia-5-alpha2-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 8790c4a..22ce588 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 5 (Cauldron) Live
linux /boot/vmlinuz
initrd /boot/cdrom/initrd.gz
-options root=mgalive:LABEL=Mageia-5-alpha1-KDE4-LiveDVD quiet rd.luks=0 rd.lvm=0 rd.md=0 rd.dm=0 install
+options root=mgalive:LABEL=Mageia-5-alpha2-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 2f97842..3972f9f 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 5 (Cauldron) Live (Safe mode)
linux /boot/vmlinuz
initrd /boot/cdrom/initrd.gz
-options root=mgalive:LABEL=Mageia-5-alpha1-KDE4-LiveDVD rd.luks=0 rd.lvm=0 rd.md=0 rd.dm=0 nokmsboot xdriver=vesa
+options root=mgalive:LABEL=Mageia-5-alpha2-KDE4-LiveDVD 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 7449b50..7449b50 100644..100755
--- a/files/hacks/message
+++ b/files/hacks/message
Binary files differ
diff --git a/files/mga_rpms/update_media.sh b/files/mga_rpms/update_media.sh
index f0bca2d..f9be889 100755
--- a/files/mga_rpms/update_media.sh
+++ b/files/mga_rpms/update_media.sh
@@ -22,13 +22,13 @@ 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/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/
+#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/
@@ -44,18 +44,18 @@ cp $bcdmedia/x86_64/media/core/release/os-prober-*.rpm x86_64/mga_rpms/core/
cp $bcdmedia/x86_64/media/core/release/efibootmgr-*.rpm x86_64/mga_rpms/core/
# add dmraid stuff
-cp $bcdmedia/i586/media/core/release/dmraid-*.rpm i586/mga_rpms/core/
-cp $bcdmedia/i586/media/core/release/libdmraid1-*.rpm i586/mga_rpms/core/
-cp $bcdmedia/i586/media/core/release/kpartx-*.rpm i586/mga_rpms/core/
+#cp $bcdmedia/i586/media/core/release/dmraid-*.rpm i586/mga_rpms/core/
+#cp $bcdmedia/i586/media/core/release/libdmraid1-*.rpm i586/mga_rpms/core/
+#cp $bcdmedia/i586/media/core/release/kpartx-*.rpm i586/mga_rpms/core/
-cp $bcdmedia/x86_64/media/core/release/dmraid-*.rpm x86_64/mga_rpms/core/
-cp $bcdmedia/x86_64/media/core/release/lib64dmraid1-*.rpm x86_64/mga_rpms/core/
-cp $bcdmedia/x86_64/media/core/release/kpartx-*.rpm x86_64/mga_rpms/core/
+#cp $bcdmedia/x86_64/media/core/release/dmraid-*.rpm x86_64/mga_rpms/core/
+#cp $bcdmedia/x86_64/media/core/release/lib64dmraid1-*.rpm x86_64/mga_rpms/core/
+#cp $bcdmedia/x86_64/media/core/release/kpartx-*.rpm x86_64/mga_rpms/core/
# add mdadm
-cp $bcdmedia/i586/media/core/release/mdadm-*.rpm i586/mga_rpms/core/
+#cp $bcdmedia/i586/media/core/release/mdadm-*.rpm i586/mga_rpms/core/
-cp $bcdmedia/x86_64/media/core/release/mdadm-*.rpm x86_64/mga_rpms/core/
+#cp $bcdmedia/x86_64/media/core/release/mdadm-*.rpm x86_64/mga_rpms/core/
# add repo pubkeys
cp $bcdmedia/i586/media/core/release/media_info/pubkey i586/mga_rpms/core/media_info/