From 2cfda7bcf6bf7f10f0c6b93b53b1306b68b9bbab Mon Sep 17 00:00:00 2001 From: Martin Whitaker Date: Sat, 29 Oct 2016 16:58:29 +0100 Subject: Refactored UEFI boot files and removed pregenerated efiboot.img files This needs the corresponding change to draklive to automatically generate the efiboot.img files. --- config/live.cfg | 17 ++++---- files/UEFI/EFI/BOOT/bootx64.efi | Bin 0 -> 802816 bytes files/UEFI/EFI/BOOT/fonts/unicode.pf2 | Bin 0 -> 2560080 bytes .../BOOT/themes/maggy/Mageia5-grub2-1024x768.png | Bin 0 -> 679782 bytes .../EFI/BOOT/themes/maggy/MageiaLogo-Bold-16.pf2 | Bin 0 -> 2795 bytes .../EFI/BOOT/themes/maggy/MageiaLogo-Bold-20.pf2 | Bin 0 -> 3139 bytes .../EFI/BOOT/themes/maggy/MageiaLogo-Bold-28.pf2 | Bin 0 -> 4205 bytes .../BOOT/themes/maggy/MageiaLogo-Regular-20.pf2 | Bin 0 -> 2984 bytes files/UEFI/EFI/BOOT/themes/maggy/theme.txt | 34 ++++++++++++++++ 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 | 43 --------------------- .../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 +++++++++++++++++++++ files/UEFI/KDE4/EFI/BOOT/bootx64.efi | Bin 802816 -> 0 bytes files/UEFI/KDE4/EFI/BOOT/fonts/unicode.pf2 | Bin 2560080 -> 0 bytes files/UEFI/KDE4/EFI/BOOT/grub.cfg | 42 -------------------- .../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/KDE4/EFI/BOOT/themes/maggy/theme.txt | 34 ---------------- files/UEFI/KDE4/boot/efiboot.img | Bin 4194304 -> 0 bytes files/UEFI/KDE4/grub.cfg | 42 ++++++++++++++++++++ 31 files changed, 128 insertions(+), 161 deletions(-) create mode 100644 files/UEFI/EFI/BOOT/bootx64.efi create mode 100755 files/UEFI/EFI/BOOT/fonts/unicode.pf2 create mode 100755 files/UEFI/EFI/BOOT/themes/maggy/Mageia5-grub2-1024x768.png create mode 100755 files/UEFI/EFI/BOOT/themes/maggy/MageiaLogo-Bold-16.pf2 create mode 100755 files/UEFI/EFI/BOOT/themes/maggy/MageiaLogo-Bold-20.pf2 create mode 100755 files/UEFI/EFI/BOOT/themes/maggy/MageiaLogo-Bold-28.pf2 create mode 100755 files/UEFI/EFI/BOOT/themes/maggy/MageiaLogo-Regular-20.pf2 create mode 100755 files/UEFI/EFI/BOOT/themes/maggy/theme.txt 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 delete mode 100644 files/UEFI/KDE4/EFI/BOOT/bootx64.efi delete mode 100755 files/UEFI/KDE4/EFI/BOOT/fonts/unicode.pf2 delete mode 100644 files/UEFI/KDE4/EFI/BOOT/grub.cfg delete mode 100755 files/UEFI/KDE4/EFI/BOOT/themes/maggy/Mageia5-grub2-1024x768.png delete mode 100755 files/UEFI/KDE4/EFI/BOOT/themes/maggy/MageiaLogo-Bold-16.pf2 delete mode 100755 files/UEFI/KDE4/EFI/BOOT/themes/maggy/MageiaLogo-Bold-20.pf2 delete mode 100755 files/UEFI/KDE4/EFI/BOOT/themes/maggy/MageiaLogo-Bold-28.pf2 delete mode 100755 files/UEFI/KDE4/EFI/BOOT/themes/maggy/MageiaLogo-Regular-20.pf2 delete mode 100755 files/UEFI/KDE4/EFI/BOOT/themes/maggy/theme.txt delete mode 100644 files/UEFI/KDE4/boot/efiboot.img create mode 100644 files/UEFI/KDE4/grub.cfg diff --git a/config/live.cfg b/config/live.cfg index fbad02e..5a0331c 100644 --- a/config/live.cfg +++ b/config/live.cfg @@ -306,14 +306,15 @@ my $_l = { pre => [ 'for i in seq 1 5; do showlabels --removable | grep ' . build_one_label($live) . '; if [ $? -eq 0 ]; then break; fi; sleep 1; done' ], extra_modules => [ qw(vfat sd_mod usb_storage uhci_hcd ohci_hcd ehci_hcd xhci_hcd) ], files => [ - if_($live->{settings}{arch} eq 'x86_64', - if_($live->{settings}{desktop} eq 'KDE4', - [ 'files/UEFI/KDE4/*', '' ], - ), - if_($live->{settings}{desktop} eq 'GNOME', - [ 'files/UEFI/GNOME/*', '' ], - ), - ), + if_($live->{settings}{arch} eq 'x86_64', + [ 'files/UEFI/EFI', '' ], + if_($live->{settings}{desktop} eq 'KDE4', + [ 'files/UEFI/KDE4/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/*', ''], #map { [ 'extra/livecd/' . $_, $_ ] } qw(LISEZMOI.pdf README.pdf) diff --git a/files/UEFI/EFI/BOOT/bootx64.efi b/files/UEFI/EFI/BOOT/bootx64.efi new file mode 100644 index 0000000..bb2352c Binary files /dev/null and b/files/UEFI/EFI/BOOT/bootx64.efi differ diff --git a/files/UEFI/EFI/BOOT/fonts/unicode.pf2 b/files/UEFI/EFI/BOOT/fonts/unicode.pf2 new file mode 100755 index 0000000..57b682a Binary files /dev/null and b/files/UEFI/EFI/BOOT/fonts/unicode.pf2 differ diff --git a/files/UEFI/EFI/BOOT/themes/maggy/Mageia5-grub2-1024x768.png b/files/UEFI/EFI/BOOT/themes/maggy/Mageia5-grub2-1024x768.png new file mode 100755 index 0000000..6bdaa67 Binary files /dev/null and b/files/UEFI/EFI/BOOT/themes/maggy/Mageia5-grub2-1024x768.png differ diff --git a/files/UEFI/EFI/BOOT/themes/maggy/MageiaLogo-Bold-16.pf2 b/files/UEFI/EFI/BOOT/themes/maggy/MageiaLogo-Bold-16.pf2 new file mode 100755 index 0000000..442e338 Binary files /dev/null and b/files/UEFI/EFI/BOOT/themes/maggy/MageiaLogo-Bold-16.pf2 differ diff --git a/files/UEFI/EFI/BOOT/themes/maggy/MageiaLogo-Bold-20.pf2 b/files/UEFI/EFI/BOOT/themes/maggy/MageiaLogo-Bold-20.pf2 new file mode 100755 index 0000000..4a435f7 Binary files /dev/null and b/files/UEFI/EFI/BOOT/themes/maggy/MageiaLogo-Bold-20.pf2 differ diff --git a/files/UEFI/EFI/BOOT/themes/maggy/MageiaLogo-Bold-28.pf2 b/files/UEFI/EFI/BOOT/themes/maggy/MageiaLogo-Bold-28.pf2 new file mode 100755 index 0000000..dee5391 Binary files /dev/null and b/files/UEFI/EFI/BOOT/themes/maggy/MageiaLogo-Bold-28.pf2 differ diff --git a/files/UEFI/EFI/BOOT/themes/maggy/MageiaLogo-Regular-20.pf2 b/files/UEFI/EFI/BOOT/themes/maggy/MageiaLogo-Regular-20.pf2 new file mode 100755 index 0000000..f12fa75 Binary files /dev/null and b/files/UEFI/EFI/BOOT/themes/maggy/MageiaLogo-Regular-20.pf2 differ diff --git a/files/UEFI/EFI/BOOT/themes/maggy/theme.txt b/files/UEFI/EFI/BOOT/themes/maggy/theme.txt new file mode 100755 index 0000000..a23dffd --- /dev/null +++ b/files/UEFI/EFI/BOOT/themes/maggy/theme.txt @@ -0,0 +1,34 @@ +# GRUB gfxmenu theme "maggy". + +title-text: "Mageia 5.1 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/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 e3d4dbb..0000000 --- a/files/UEFI/GNOME/EFI/BOOT/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-5.1-GNOME-LiveDVD' - -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 '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/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 a23dffd..0000000 --- a/files/UEFI/GNOME/EFI/BOOT/themes/maggy/theme.txt +++ /dev/null @@ -1,34 +0,0 @@ -# GRUB gfxmenu theme "maggy". - -title-text: "Mageia 5.1 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 abcf3d1..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..e3d4dbb --- /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-5.1-GNOME-LiveDVD' + +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 '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/KDE4/EFI/BOOT/bootx64.efi b/files/UEFI/KDE4/EFI/BOOT/bootx64.efi deleted file mode 100644 index bb2352c..0000000 Binary files a/files/UEFI/KDE4/EFI/BOOT/bootx64.efi and /dev/null differ diff --git a/files/UEFI/KDE4/EFI/BOOT/fonts/unicode.pf2 b/files/UEFI/KDE4/EFI/BOOT/fonts/unicode.pf2 deleted file mode 100755 index 57b682a..0000000 Binary files a/files/UEFI/KDE4/EFI/BOOT/fonts/unicode.pf2 and /dev/null differ diff --git a/files/UEFI/KDE4/EFI/BOOT/grub.cfg b/files/UEFI/KDE4/EFI/BOOT/grub.cfg deleted file mode 100644 index cf9ae2e..0000000 --- a/files/UEFI/KDE4/EFI/BOOT/grub.cfg +++ /dev/null @@ -1,42 +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-5.1-KDE4-LiveDVD' - -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 '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/Mageia5-grub2-1024x768.png b/files/UEFI/KDE4/EFI/BOOT/themes/maggy/Mageia5-grub2-1024x768.png deleted file mode 100755 index 6bdaa67..0000000 Binary files a/files/UEFI/KDE4/EFI/BOOT/themes/maggy/Mageia5-grub2-1024x768.png and /dev/null differ diff --git a/files/UEFI/KDE4/EFI/BOOT/themes/maggy/MageiaLogo-Bold-16.pf2 b/files/UEFI/KDE4/EFI/BOOT/themes/maggy/MageiaLogo-Bold-16.pf2 deleted file mode 100755 index 442e338..0000000 Binary files a/files/UEFI/KDE4/EFI/BOOT/themes/maggy/MageiaLogo-Bold-16.pf2 and /dev/null differ diff --git a/files/UEFI/KDE4/EFI/BOOT/themes/maggy/MageiaLogo-Bold-20.pf2 b/files/UEFI/KDE4/EFI/BOOT/themes/maggy/MageiaLogo-Bold-20.pf2 deleted file mode 100755 index 4a435f7..0000000 Binary files a/files/UEFI/KDE4/EFI/BOOT/themes/maggy/MageiaLogo-Bold-20.pf2 and /dev/null differ diff --git a/files/UEFI/KDE4/EFI/BOOT/themes/maggy/MageiaLogo-Bold-28.pf2 b/files/UEFI/KDE4/EFI/BOOT/themes/maggy/MageiaLogo-Bold-28.pf2 deleted file mode 100755 index dee5391..0000000 Binary files a/files/UEFI/KDE4/EFI/BOOT/themes/maggy/MageiaLogo-Bold-28.pf2 and /dev/null differ diff --git a/files/UEFI/KDE4/EFI/BOOT/themes/maggy/MageiaLogo-Regular-20.pf2 b/files/UEFI/KDE4/EFI/BOOT/themes/maggy/MageiaLogo-Regular-20.pf2 deleted file mode 100755 index f12fa75..0000000 Binary files a/files/UEFI/KDE4/EFI/BOOT/themes/maggy/MageiaLogo-Regular-20.pf2 and /dev/null differ diff --git a/files/UEFI/KDE4/EFI/BOOT/themes/maggy/theme.txt b/files/UEFI/KDE4/EFI/BOOT/themes/maggy/theme.txt deleted file mode 100755 index a23dffd..0000000 --- a/files/UEFI/KDE4/EFI/BOOT/themes/maggy/theme.txt +++ /dev/null @@ -1,34 +0,0 @@ -# GRUB gfxmenu theme "maggy". - -title-text: "Mageia 5.1 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/KDE4/boot/efiboot.img b/files/UEFI/KDE4/boot/efiboot.img deleted file mode 100644 index cb5a4fb..0000000 Binary files a/files/UEFI/KDE4/boot/efiboot.img and /dev/null differ diff --git a/files/UEFI/KDE4/grub.cfg b/files/UEFI/KDE4/grub.cfg new file mode 100644 index 0000000..cf9ae2e --- /dev/null +++ b/files/UEFI/KDE4/grub.cfg @@ -0,0 +1,42 @@ + +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-5.1-KDE4-LiveDVD' + +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 '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 +} -- cgit v1.2.1