summaryrefslogtreecommitdiffstats
path: root/files
diff options
context:
space:
mode:
authorMartin Whitaker <mageia@martin-whitaker.me.uk>2016-11-12 20:27:18 +0000
committerMartin Whitaker <mageia@martin-whitaker.me.uk>2016-11-12 20:27:18 +0000
commit5c4c45d0b4cc28a7395ea4459c495a918c1df5be (patch)
tree79294a1c2f34ffbbfa055b2bfd70b979bb87fd01 /files
parent9ed3af28563ff8573221731402122d696195c3a6 (diff)
downloaddraklive-config-5c4c45d0b4cc28a7395ea4459c495a918c1df5be.tar
draklive-config-5c4c45d0b4cc28a7395ea4459c495a918c1df5be.tar.gz
draklive-config-5c4c45d0b4cc28a7395ea4459c495a918c1df5be.tar.bz2
draklive-config-5c4c45d0b4cc28a7395ea4459c495a918c1df5be.tar.xz
draklive-config-5c4c45d0b4cc28a7395ea4459c495a918c1df5be.zip
Allow draklive to automatically write disk labels into EFI grub.cfg file.
Diffstat (limited to 'files')
-rw-r--r--files/UEFI/EFI/BOOT/grub.cfg (renamed from files/UEFI/PLASMA5/grub.cfg)10
-rw-r--r--files/UEFI/GNOME/grub.cfg43
2 files changed, 5 insertions, 48 deletions
diff --git a/files/UEFI/PLASMA5/grub.cfg b/files/UEFI/EFI/BOOT/grub.cfg
index 1f79394..8f32598 100644
--- a/files/UEFI/PLASMA5/grub.cfg
+++ b/files/UEFI/EFI/BOOT/grub.cfg
@@ -20,24 +20,24 @@ export theme
set timeout=10
-search --no-floppy --set=root -l 'Mageia-6-PLASMA5-LiveDVD'
+search --no-floppy --set=root -l 'VOLUME_LABEL'
menuentry 'Boot Mageia 6 (Cauldron) Live' {
- linux /boot/vmlinuz root=mgalive:LABEL=Mageia-6-PLASMA5-LiveDVD splash quiet noiswmd rd.luks=0 rd.lvm=0 rd.md=0 rd.dm=0 xdriver=free
+ linux /boot/vmlinuz root=mgalive:LABEL=VOLUME_LABEL splash quiet noiswmd rd.luks=0 rd.lvm=0 rd.md=0 rd.dm=0 xdriver=free
initrd /boot/cdrom/initrd.gz
}
menuentry 'Boot Mageia 6 (Cauldron) Live (using proprietary graphics drivers)' {
- linux /boot/vmlinuz root=mgalive:LABEL=Mageia-6-PLASMA5-LiveDVD splash quiet noiswmd rd.luks=0 rd.lvm=0 rd.md=0 rd.dm=0
+ linux /boot/vmlinuz root=mgalive:LABEL=VOLUME_LABEL splash quiet noiswmd rd.luks=0 rd.lvm=0 rd.md=0 rd.dm=0
initrd /boot/cdrom/initrd.gz
}
menuentry 'Install Mageia 6 (Cauldron) Live' {
- linux /boot/vmlinuz root=mgalive:LABEL=Mageia-6-PLASMA5-LiveDVD splash quiet noiswmd rd.luks=0 rd.lvm=0 rd.md=0 rd.dm=0 xdriver=free install
+ linux /boot/vmlinuz root=mgalive:LABEL=VOLUME_LABEL 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 6 (Cauldron) Live (using proprietary graphics drivers)' {
- linux /boot/vmlinuz root=mgalive:LABEL=Mageia-6-PLASMA5-LiveDVD splash quiet noiswmd rd.luks=0 rd.lvm=0 rd.md=0 rd.dm=0 install
+ linux /boot/vmlinuz root=mgalive:LABEL=VOLUME_LABEL 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/grub.cfg b/files/UEFI/GNOME/grub.cfg
deleted file mode 100644
index ed9fb7a..0000000
--- a/files/UEFI/GNOME/grub.cfg
+++ /dev/null
@@ -1,43 +0,0 @@
-
-insmod efi_gop
-insmod efi_uga
-insmod video_bochs
-insmod video_cirrus
-insmod video_fb
-
-insmod font
-if loadfont ${prefix}/fonts/unicode.pf2
-then
- insmod gfxterm
- set gfxmode=auto
- set gfxpayload=keep
- terminal_output gfxterm
-fi
-
-insmod png
-set theme=/EFI/BOOT/themes/maggy/theme.txt
-export theme
-
-set timeout=10
-
-search --no-floppy --set=root -l 'Mageia-6-GNOME-LiveDVD'
-
-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 xdriver=free
- initrd /boot/cdrom/initrd.gz
-}
-
-menuentry 'Boot Mageia 6 (Cauldron) Live (using proprietary graphics drivers)' {
- 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 nomodeset
- initrd /boot/cdrom/initrd.gz
-}
-
-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 xdriver=free install
- initrd /boot/cdrom/initrd.gz
-}
-
-menuentry 'Install Mageia 6 (Cauldron) Live (using proprietary graphics drivers)' {
- 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 nomodeset
- initrd /boot/cdrom/initrd.gz
-}