summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--config/settings-livecd.cfg6
-rw-r--r--files/UEFI/GNOME/EFI/BOOT/grub.cfg10
-rwxr-xr-xfiles/UEFI/GNOME/EFI/BOOT/themes/maggy/theme.txt2
-rw-r--r--files/UEFI/KDE4/EFI/BOOT/grub.cfg10
-rwxr-xr-xfiles/UEFI/KDE4/EFI/BOOT/themes/maggy/theme.txt2
5 files changed, 15 insertions, 15 deletions
diff --git a/config/settings-livecd.cfg b/config/settings-livecd.cfg
index 8c05882..210abc5 100644
--- a/config/settings-livecd.cfg
+++ b/config/settings-livecd.cfg
@@ -1,17 +1,17 @@
#repository=/distrib/mageia/distrib/cauldron
-repository=/home/bcd/build_bcd/pieces/5
+repository=/home/bcd/build_bcd/pieces/cauldron
#repository=/home/draklive/distrib/cauldron
# updates_repository=/distrib/mageia/distrib/cauldron
# updates_repository=/home/bcd/build_bcd/pieces/cauldron
additional_repository=
arch=i586
-desktop=KDE4
+desktop=GNOME
media=DVD
region=all
pack=
name=Mageia
product=LiveDVD
-version=5
+version=6-dev1
commercial=0
default_user=live
builddir=/home/draklive/var-data/build
diff --git a/files/UEFI/GNOME/EFI/BOOT/grub.cfg b/files/UEFI/GNOME/EFI/BOOT/grub.cfg
index 06c3761..09a1630 100644
--- a/files/UEFI/GNOME/EFI/BOOT/grub.cfg
+++ b/files/UEFI/GNOME/EFI/BOOT/grub.cfg
@@ -20,14 +20,14 @@ export theme
set timeout=10
-search --no-floppy --set=root -l 'Mageia-5-GNOME-LiveDVD'
+search --no-floppy --set=root -l 'Mageia-6-GNOME-LiveDVD'
-menuentry 'Boot Mageia 5 Live' {
- linux /boot/vmlinuz root=mgalive:LABEL=Mageia-5-GNOME-LiveDVD splash quiet noiswmd rd.luks=0 rd.lvm=0 rd.md=0 rd.dm=0
+menuentry 'Boot Mageia 6 (Cauldron) Live' {
+ linux /boot/vmlinuz root=mgalive:LABEL=Mageia-6-GNOME-LiveDVD splash quiet noiswmd rd.luks=0 rd.lvm=0 rd.md=0 rd.dm=0
initrd /boot/cdrom/initrd.gz
}
-menuentry 'Install Mageia 5 Live' {
- linux /boot/vmlinuz root=mgalive:LABEL=Mageia-5-GNOME-LiveDVD splash quiet noiswmd rd.luks=0 rd.lvm=0 rd.md=0 rd.dm=0 install
+menuentry 'Install Mageia 6 (Cauldron) Live' {
+ linux /boot/vmlinuz root=mgalive:LABEL=Mageia-6-GNOME-LiveDVD splash quiet noiswmd rd.luks=0 rd.lvm=0 rd.md=0 rd.dm=0 install
initrd /boot/cdrom/initrd.gz
}
diff --git a/files/UEFI/GNOME/EFI/BOOT/themes/maggy/theme.txt b/files/UEFI/GNOME/EFI/BOOT/themes/maggy/theme.txt
index 468291b..c645b40 100755
--- a/files/UEFI/GNOME/EFI/BOOT/themes/maggy/theme.txt
+++ b/files/UEFI/GNOME/EFI/BOOT/themes/maggy/theme.txt
@@ -1,6 +1,6 @@
# GRUB gfxmenu theme "maggy".
-title-text: "Mageia 5 UEFI"
+title-text: "Mageia 6 UEFI"
title-font: "MageiaLogo Bold 28"
title-color: "white"
diff --git a/files/UEFI/KDE4/EFI/BOOT/grub.cfg b/files/UEFI/KDE4/EFI/BOOT/grub.cfg
index f5a29af..71a916a 100644
--- a/files/UEFI/KDE4/EFI/BOOT/grub.cfg
+++ b/files/UEFI/KDE4/EFI/BOOT/grub.cfg
@@ -20,14 +20,14 @@ export theme
set timeout=10
-search --no-floppy --set=root -l 'Mageia-5-KDE4-LiveDVD'
+search --no-floppy --set=root -l 'Mageia-6-KDE4-LiveDVD'
-menuentry 'Boot Mageia 5 Live' {
- linux /boot/vmlinuz root=mgalive:LABEL=Mageia-5-KDE4-LiveDVD splash quiet noiswmd rd.luks=0 rd.lvm=0 rd.md=0 rd.dm=0
+menuentry 'Boot Mageia 6 (Cauldron) Live' {
+ linux /boot/vmlinuz root=mgalive:LABEL=Mageia-6-KDE4-LiveDVD splash quiet noiswmd rd.luks=0 rd.lvm=0 rd.md=0 rd.dm=0
initrd /boot/cdrom/initrd.gz
}
-menuentry 'Install Mageia 5 Live' {
- linux /boot/vmlinuz root=mgalive:LABEL=Mageia-5-KDE4-LiveDVD splash quiet noiswmd rd.luks=0 rd.lvm=0 rd.md=0 rd.dm=0 install
+menuentry 'Install Mageia 6 (Cauldron) Live' {
+ linux /boot/vmlinuz root=mgalive:LABEL=Mageia-6-KDE4-LiveDVD splash quiet noiswmd rd.luks=0 rd.lvm=0 rd.md=0 rd.dm=0 install
initrd /boot/cdrom/initrd.gz
}
diff --git a/files/UEFI/KDE4/EFI/BOOT/themes/maggy/theme.txt b/files/UEFI/KDE4/EFI/BOOT/themes/maggy/theme.txt
index 468291b..c645b40 100755
--- a/files/UEFI/KDE4/EFI/BOOT/themes/maggy/theme.txt
+++ b/files/UEFI/KDE4/EFI/BOOT/themes/maggy/theme.txt
@@ -1,6 +1,6 @@
# GRUB gfxmenu theme "maggy".
-title-text: "Mageia 5 UEFI"
+title-text: "Mageia 6 UEFI"
title-font: "MageiaLogo Bold 28"
title-color: "white"