summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMartin Whitaker <mageia@martin-whitaker.me.uk>2016-10-21 22:09:37 +0100
committerMartin Whitaker <mageia@martin-whitaker.me.uk>2016-10-25 08:44:55 +0100
commit4525c3ee313471544188dedb7a9996a3d2b1200c (patch)
tree80a4e495e7a54a6a9957e0dc80763cd1661776ea
parent476d048b6a448600977d5f45c35e8f5f029c8b99 (diff)
downloaddraklive-config-4525c3ee313471544188dedb7a9996a3d2b1200c.tar
draklive-config-4525c3ee313471544188dedb7a9996a3d2b1200c.tar.gz
draklive-config-4525c3ee313471544188dedb7a9996a3d2b1200c.tar.bz2
draklive-config-4525c3ee313471544188dedb7a9996a3d2b1200c.tar.xz
draklive-config-4525c3ee313471544188dedb7a9996a3d2b1200c.zip
Change Mageia 5 to Mageia 5.1 in UEFI boot menus.
-rw-r--r--files/UEFI/GNOME/EFI/BOOT/grub.cfg20
-rwxr-xr-xfiles/UEFI/GNOME/EFI/BOOT/themes/maggy/theme.txt2
-rw-r--r--files/UEFI/GNOME/boot/efiboot.imgbin4194304 -> 4194304 bytes
-rw-r--r--files/UEFI/KDE4/EFI/BOOT/grub.cfg19
-rwxr-xr-xfiles/UEFI/KDE4/EFI/BOOT/themes/maggy/theme.txt2
-rw-r--r--files/UEFI/KDE4/boot/efiboot.imgbin4194304 -> 4194304 bytes
6 files changed, 31 insertions, 12 deletions
diff --git a/files/UEFI/GNOME/EFI/BOOT/grub.cfg b/files/UEFI/GNOME/EFI/BOOT/grub.cfg
index 06c3761..e3d4dbb 100644
--- a/files/UEFI/GNOME/EFI/BOOT/grub.cfg
+++ b/files/UEFI/GNOME/EFI/BOOT/grub.cfg
@@ -20,14 +20,24 @@ export theme
set timeout=10
-search --no-floppy --set=root -l 'Mageia-5-GNOME-LiveDVD'
+search --no-floppy --set=root -l 'Mageia-5.1-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 5.1 Live' {
+ linux /boot/vmlinuz root=mgalive:LABEL=Mageia-5.1-GNOME-LiveDVD splash quiet noiswmd rd.luks=0 rd.lvm=0 rd.md=0 rd.dm=0 xdriver=free
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 'Boot Mageia 5.1 Live (using proprietary graphics drivers)' {
+ linux /boot/vmlinuz root=mgalive:LABEL=Mageia-5.1-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.1 Live' {
+ linux /boot/vmlinuz root=mgalive:LABEL=Mageia-5.1-GNOME-LiveDVD splash quiet noiswmd rd.luks=0 rd.lvm=0 rd.md=0 rd.dm=0 xdriver=free install
+ initrd /boot/cdrom/initrd.gz
+}
+
+menuentry 'Install Mageia 5.1 Live (using proprietary graphics drivers)' {
+ linux /boot/vmlinuz root=mgalive:LABEL=Mageia-5.1-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..a23dffd 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 5.1 UEFI"
title-font: "MageiaLogo Bold 28"
title-color: "white"
diff --git a/files/UEFI/GNOME/boot/efiboot.img b/files/UEFI/GNOME/boot/efiboot.img
index 606c7bf..abcf3d1 100644
--- a/files/UEFI/GNOME/boot/efiboot.img
+++ b/files/UEFI/GNOME/boot/efiboot.img
Binary files differ
diff --git a/files/UEFI/KDE4/EFI/BOOT/grub.cfg b/files/UEFI/KDE4/EFI/BOOT/grub.cfg
index f5a29af..cf9ae2e 100644
--- a/files/UEFI/KDE4/EFI/BOOT/grub.cfg
+++ b/files/UEFI/KDE4/EFI/BOOT/grub.cfg
@@ -20,14 +20,23 @@ export theme
set timeout=10
-search --no-floppy --set=root -l 'Mageia-5-KDE4-LiveDVD'
+search --no-floppy --set=root -l 'Mageia-5.1-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 5.1 Live' {
+ linux /boot/vmlinuz root=mgalive:LABEL=Mageia-5.1-KDE4-LiveDVD splash quiet noiswmd rd.luks=0 rd.lvm=0 rd.md=0 rd.dm=0 xdriver=free
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 'Boot Mageia 5.1 Live (using proprietary graphics drivers)' {
+ linux /boot/vmlinuz root=mgalive:LABEL=Mageia-5.1-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.1 Live' {
+ linux /boot/vmlinuz root=mgalive:LABEL=Mageia-5.1-KDE4-LiveDVD splash quiet noiswmd rd.luks=0 rd.lvm=0 rd.md=0 rd.dm=0 xdriver=free install
+ initrd /boot/cdrom/initrd.gz
+}
+menuentry 'Install Mageia 5.1 Live (using proprietary graphics drivers)' {
+ linux /boot/vmlinuz root=mgalive:LABEL=Mageia-5.1-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..a23dffd 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 5.1 UEFI"
title-font: "MageiaLogo Bold 28"
title-color: "white"
diff --git a/files/UEFI/KDE4/boot/efiboot.img b/files/UEFI/KDE4/boot/efiboot.img
index 587f232..cb5a4fb 100644
--- a/files/UEFI/KDE4/boot/efiboot.img
+++ b/files/UEFI/KDE4/boot/efiboot.img
Binary files differ