From fba8ae55ba4afd5a0bd7c96c68fb16d2ad2ace0b Mon Sep 17 00:00:00 2001 From: Martin Whitaker Date: Sat, 12 Nov 2016 17:46:33 +0000 Subject: UEFI boot: refactored files, updated theme, added options to boot with proprietary drivers. --- files/UEFI/GNOME/EFI/BOOT/bootx64.efi | Bin 802816 -> 0 bytes files/UEFI/GNOME/EFI/BOOT/fonts/unicode.pf2 | Bin 2560080 -> 0 bytes files/UEFI/GNOME/EFI/BOOT/grub.cfg | 33 ---------------- .../BOOT/themes/maggy/Mageia5-grub2-1024x768.png | Bin 679782 -> 0 bytes .../EFI/BOOT/themes/maggy/MageiaLogo-Bold-16.pf2 | Bin 2795 -> 0 bytes .../EFI/BOOT/themes/maggy/MageiaLogo-Bold-20.pf2 | Bin 3139 -> 0 bytes .../EFI/BOOT/themes/maggy/MageiaLogo-Bold-28.pf2 | Bin 4205 -> 0 bytes .../BOOT/themes/maggy/MageiaLogo-Regular-20.pf2 | Bin 2984 -> 0 bytes files/UEFI/GNOME/EFI/BOOT/themes/maggy/theme.txt | 34 ---------------- files/UEFI/GNOME/boot/efiboot.img | Bin 4194304 -> 0 bytes files/UEFI/GNOME/grub.cfg | 43 +++++++++++++++++++++ 11 files changed, 43 insertions(+), 67 deletions(-) delete mode 100644 files/UEFI/GNOME/EFI/BOOT/bootx64.efi delete mode 100755 files/UEFI/GNOME/EFI/BOOT/fonts/unicode.pf2 delete mode 100644 files/UEFI/GNOME/EFI/BOOT/grub.cfg delete mode 100755 files/UEFI/GNOME/EFI/BOOT/themes/maggy/Mageia5-grub2-1024x768.png delete mode 100755 files/UEFI/GNOME/EFI/BOOT/themes/maggy/MageiaLogo-Bold-16.pf2 delete mode 100755 files/UEFI/GNOME/EFI/BOOT/themes/maggy/MageiaLogo-Bold-20.pf2 delete mode 100755 files/UEFI/GNOME/EFI/BOOT/themes/maggy/MageiaLogo-Bold-28.pf2 delete mode 100755 files/UEFI/GNOME/EFI/BOOT/themes/maggy/MageiaLogo-Regular-20.pf2 delete mode 100755 files/UEFI/GNOME/EFI/BOOT/themes/maggy/theme.txt delete mode 100644 files/UEFI/GNOME/boot/efiboot.img create mode 100644 files/UEFI/GNOME/grub.cfg (limited to 'files/UEFI/GNOME') diff --git a/files/UEFI/GNOME/EFI/BOOT/bootx64.efi b/files/UEFI/GNOME/EFI/BOOT/bootx64.efi deleted file mode 100644 index bb2352c..0000000 Binary files a/files/UEFI/GNOME/EFI/BOOT/bootx64.efi and /dev/null differ diff --git a/files/UEFI/GNOME/EFI/BOOT/fonts/unicode.pf2 b/files/UEFI/GNOME/EFI/BOOT/fonts/unicode.pf2 deleted file mode 100755 index 57b682a..0000000 Binary files a/files/UEFI/GNOME/EFI/BOOT/fonts/unicode.pf2 and /dev/null differ diff --git a/files/UEFI/GNOME/EFI/BOOT/grub.cfg b/files/UEFI/GNOME/EFI/BOOT/grub.cfg deleted file mode 100644 index 09a1630..0000000 --- a/files/UEFI/GNOME/EFI/BOOT/grub.cfg +++ /dev/null @@ -1,33 +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 - 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 install - initrd /boot/cdrom/initrd.gz -} diff --git a/files/UEFI/GNOME/EFI/BOOT/themes/maggy/Mageia5-grub2-1024x768.png b/files/UEFI/GNOME/EFI/BOOT/themes/maggy/Mageia5-grub2-1024x768.png deleted file mode 100755 index 6bdaa67..0000000 Binary files a/files/UEFI/GNOME/EFI/BOOT/themes/maggy/Mageia5-grub2-1024x768.png and /dev/null differ diff --git a/files/UEFI/GNOME/EFI/BOOT/themes/maggy/MageiaLogo-Bold-16.pf2 b/files/UEFI/GNOME/EFI/BOOT/themes/maggy/MageiaLogo-Bold-16.pf2 deleted file mode 100755 index 442e338..0000000 Binary files a/files/UEFI/GNOME/EFI/BOOT/themes/maggy/MageiaLogo-Bold-16.pf2 and /dev/null differ diff --git a/files/UEFI/GNOME/EFI/BOOT/themes/maggy/MageiaLogo-Bold-20.pf2 b/files/UEFI/GNOME/EFI/BOOT/themes/maggy/MageiaLogo-Bold-20.pf2 deleted file mode 100755 index 4a435f7..0000000 Binary files a/files/UEFI/GNOME/EFI/BOOT/themes/maggy/MageiaLogo-Bold-20.pf2 and /dev/null differ diff --git a/files/UEFI/GNOME/EFI/BOOT/themes/maggy/MageiaLogo-Bold-28.pf2 b/files/UEFI/GNOME/EFI/BOOT/themes/maggy/MageiaLogo-Bold-28.pf2 deleted file mode 100755 index dee5391..0000000 Binary files a/files/UEFI/GNOME/EFI/BOOT/themes/maggy/MageiaLogo-Bold-28.pf2 and /dev/null differ diff --git a/files/UEFI/GNOME/EFI/BOOT/themes/maggy/MageiaLogo-Regular-20.pf2 b/files/UEFI/GNOME/EFI/BOOT/themes/maggy/MageiaLogo-Regular-20.pf2 deleted file mode 100755 index f12fa75..0000000 Binary files a/files/UEFI/GNOME/EFI/BOOT/themes/maggy/MageiaLogo-Regular-20.pf2 and /dev/null differ diff --git a/files/UEFI/GNOME/EFI/BOOT/themes/maggy/theme.txt b/files/UEFI/GNOME/EFI/BOOT/themes/maggy/theme.txt deleted file mode 100755 index 96c4581..0000000 --- a/files/UEFI/GNOME/EFI/BOOT/themes/maggy/theme.txt +++ /dev/null @@ -1,34 +0,0 @@ -# GRUB gfxmenu theme "maggy". - -title-text: "Mageia 6 (Cauldron) UEFI" -title-font: "MageiaLogo Bold 28" -title-color: "white" - -desktop-image: "Mageia5-grub2-1024x768.png" -terminal-font: "Unknown Regular 16" - -+ boot_menu { - left = 15% - top = 15% - width = 70% - height = 55% - item_font = "MageiaLogo Regular 20" - selected_item_font = "MageiaLogo Bold 20" - color_normal="black/black" - item_color = "#2397d4" - selected_item_color = "white" - item_height = 24 - item_spacing = 10 -} - -+ progress_bar -{ - id = "__timeout__" - left = 15% - top = 65% - width = 70% - height = 1% - fg_color = "lightskyblue" - bg_color = "dodgerblue" - border_color = "midnightblue" -} diff --git a/files/UEFI/GNOME/boot/efiboot.img b/files/UEFI/GNOME/boot/efiboot.img deleted file mode 100644 index 50fcac1..0000000 Binary files a/files/UEFI/GNOME/boot/efiboot.img and /dev/null differ diff --git a/files/UEFI/GNOME/grub.cfg b/files/UEFI/GNOME/grub.cfg new file mode 100644 index 0000000..ed9fb7a --- /dev/null +++ b/files/UEFI/GNOME/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 '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 +} -- cgit v1.2.1