From 5c4c45d0b4cc28a7395ea4459c495a918c1df5be Mon Sep 17 00:00:00 2001 From: Martin Whitaker Date: Sat, 12 Nov 2016 20:27:18 +0000 Subject: Allow draklive to automatically write disk labels into EFI grub.cfg file. --- config/live.cfg | 6 ------ files/UEFI/EFI/BOOT/grub.cfg | 43 +++++++++++++++++++++++++++++++++++++++++++ files/UEFI/GNOME/grub.cfg | 43 ------------------------------------------- files/UEFI/PLASMA5/grub.cfg | 43 ------------------------------------------- 4 files changed, 43 insertions(+), 92 deletions(-) create mode 100644 files/UEFI/EFI/BOOT/grub.cfg delete mode 100644 files/UEFI/GNOME/grub.cfg delete mode 100644 files/UEFI/PLASMA5/grub.cfg diff --git a/config/live.cfg b/config/live.cfg index 1cb3e4b..29335b6 100644 --- a/config/live.cfg +++ b/config/live.cfg @@ -284,12 +284,6 @@ my $_l = { files => [ if_($live->{settings}{arch} eq 'x86_64', [ 'files/UEFI/EFI', '' ], - if_($live->{settings}{desktop} eq 'PLASMA5', - [ 'files/UEFI/PLASMA5/grub.cfg', 'EFI/BOOT/' ], - ), - if_($live->{settings}{desktop} eq 'GNOME', - [ 'files/UEFI/GNOME/grub.cfg', 'EFI/BOOT/' ], - ), ), # FIXME: add doc and autorun #[ 'extra/livecd/autorun/*', ''], diff --git a/files/UEFI/EFI/BOOT/grub.cfg b/files/UEFI/EFI/BOOT/grub.cfg new file mode 100644 index 0000000..8f32598 --- /dev/null +++ b/files/UEFI/EFI/BOOT/grub.cfg @@ -0,0 +1,43 @@ + +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 'VOLUME_LABEL' + +menuentry 'Boot Mageia 6 (Cauldron) Live' { + 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=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=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=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 -} diff --git a/files/UEFI/PLASMA5/grub.cfg b/files/UEFI/PLASMA5/grub.cfg deleted file mode 100644 index 1f79394..0000000 --- a/files/UEFI/PLASMA5/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-PLASMA5-LiveDVD' - -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 - 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 - 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 - 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 - initrd /boot/cdrom/initrd.gz -} -- cgit v1.2.1