From bf15bffd02290a82cb114330e8ac5527bea3abc8 Mon Sep 17 00:00:00 2001 From: Martin Whitaker Date: Wed, 29 Nov 2017 17:55:39 +0000 Subject: Update configuration to work with draklive2/grub2. --- files/UEFI/EFI/BOOT/bootx64.efi | Bin 802816 -> 0 bytes files/UEFI/EFI/BOOT/fonts/unicode.pf2 | Bin 2560080 -> 0 bytes files/UEFI/EFI/BOOT/grub.cfg | 47 ------------------- .../EFI/BOOT/themes/maggy/MageiaLogo-Bold-16.pf2 | Bin 3602 -> 0 bytes .../EFI/BOOT/themes/maggy/MageiaLogo-Bold-20.pf2 | Bin 4922 -> 0 bytes .../EFI/BOOT/themes/maggy/MageiaLogo-Bold-28.pf2 | Bin 6142 -> 0 bytes .../BOOT/themes/maggy/MageiaLogo-Regular-20.pf2 | Bin 4761 -> 0 bytes .../EFI/BOOT/themes/maggy/grub2-mageia-default.png | Bin 178033 -> 0 bytes files/UEFI/EFI/BOOT/themes/maggy/theme.txt | 50 --------------------- 9 files changed, 97 deletions(-) delete mode 100644 files/UEFI/EFI/BOOT/bootx64.efi delete mode 100755 files/UEFI/EFI/BOOT/fonts/unicode.pf2 delete mode 100644 files/UEFI/EFI/BOOT/grub.cfg delete mode 100755 files/UEFI/EFI/BOOT/themes/maggy/MageiaLogo-Bold-16.pf2 delete mode 100755 files/UEFI/EFI/BOOT/themes/maggy/MageiaLogo-Bold-20.pf2 delete mode 100755 files/UEFI/EFI/BOOT/themes/maggy/MageiaLogo-Bold-28.pf2 delete mode 100755 files/UEFI/EFI/BOOT/themes/maggy/MageiaLogo-Regular-20.pf2 delete mode 100644 files/UEFI/EFI/BOOT/themes/maggy/grub2-mageia-default.png delete mode 100755 files/UEFI/EFI/BOOT/themes/maggy/theme.txt (limited to 'files') diff --git a/files/UEFI/EFI/BOOT/bootx64.efi b/files/UEFI/EFI/BOOT/bootx64.efi deleted file mode 100644 index bb2352c..0000000 Binary files a/files/UEFI/EFI/BOOT/bootx64.efi and /dev/null differ diff --git a/files/UEFI/EFI/BOOT/fonts/unicode.pf2 b/files/UEFI/EFI/BOOT/fonts/unicode.pf2 deleted file mode 100755 index 57b682a..0000000 Binary files a/files/UEFI/EFI/BOOT/fonts/unicode.pf2 and /dev/null differ diff --git a/files/UEFI/EFI/BOOT/grub.cfg b/files/UEFI/EFI/BOOT/grub.cfg deleted file mode 100644 index 529ca74..0000000 --- a/files/UEFI/EFI/BOOT/grub.cfg +++ /dev/null @@ -1,47 +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=1024x768,800x600,auto - set gfxpayload=keep - terminal_output gfxterm -fi - -insmod png -set theme=/EFI/BOOT/themes/maggy/theme.txt -export theme -loadfont /EFI/BOOT/themes/maggy/MageiaLogo-Bold-16.pf2 -loadfont /EFI/BOOT/themes/maggy/MageiaLogo-Bold-20.pf2 -loadfont /EFI/BOOT/themes/maggy/MageiaLogo-Bold-28.pf2 -loadfont /EFI/BOOT/themes/maggy/MageiaLogo-Regular-20.pf2 - -set timeout=10 - -search --no-floppy --set=root -l 'VOLUME_LABEL' - -menuentry 'Boot Mageia 6 Live' { - linux /boot/vmlinuz root=mgalive:LABEL=VOLUME_LABEL splash quiet noiswmd audit=0 rd.luks=0 rd.lvm=0 rd.md=0 rd.dm=0 xdriver=free - initrd /boot/cdrom/initrd.gz -} - -menuentry ' + use non-free video drivers (slower to boot)' { - linux /boot/vmlinuz root=mgalive:LABEL=VOLUME_LABEL splash quiet noiswmd audit=0 rd.luks=0 rd.lvm=0 rd.md=0 rd.dm=0 nokmsboot - initrd /boot/cdrom/initrd.gz -} - -menuentry 'Install Mageia 6 Live' { - linux /boot/vmlinuz root=mgalive:LABEL=VOLUME_LABEL splash quiet noiswmd audit=0 rd.luks=0 rd.lvm=0 rd.md=0 rd.dm=0 install xdriver=free - initrd /boot/cdrom/initrd.gz -} - -menuentry ' + use non-free video drivers (slower to boot)' { - linux /boot/vmlinuz root=mgalive:LABEL=VOLUME_LABEL splash quiet noiswmd audit=0 rd.luks=0 rd.lvm=0 rd.md=0 rd.dm=0 install nokmsboot - initrd /boot/cdrom/initrd.gz -} diff --git a/files/UEFI/EFI/BOOT/themes/maggy/MageiaLogo-Bold-16.pf2 b/files/UEFI/EFI/BOOT/themes/maggy/MageiaLogo-Bold-16.pf2 deleted file mode 100755 index 2fd329b..0000000 Binary files a/files/UEFI/EFI/BOOT/themes/maggy/MageiaLogo-Bold-16.pf2 and /dev/null 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 deleted file mode 100755 index 6e619c9..0000000 Binary files a/files/UEFI/EFI/BOOT/themes/maggy/MageiaLogo-Bold-20.pf2 and /dev/null 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 deleted file mode 100755 index 605406f..0000000 Binary files a/files/UEFI/EFI/BOOT/themes/maggy/MageiaLogo-Bold-28.pf2 and /dev/null 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 deleted file mode 100755 index 5cb52f4..0000000 Binary files a/files/UEFI/EFI/BOOT/themes/maggy/MageiaLogo-Regular-20.pf2 and /dev/null differ diff --git a/files/UEFI/EFI/BOOT/themes/maggy/grub2-mageia-default.png b/files/UEFI/EFI/BOOT/themes/maggy/grub2-mageia-default.png deleted file mode 100644 index df9c862..0000000 Binary files a/files/UEFI/EFI/BOOT/themes/maggy/grub2-mageia-default.png and /dev/null differ diff --git a/files/UEFI/EFI/BOOT/themes/maggy/theme.txt b/files/UEFI/EFI/BOOT/themes/maggy/theme.txt deleted file mode 100755 index 598612f..0000000 --- a/files/UEFI/EFI/BOOT/themes/maggy/theme.txt +++ /dev/null @@ -1,50 +0,0 @@ -# GRUB gfxmenu theme "maggy". - -title-text: "Mageia 6 UEFI" -title-font: "MageiaLogo Bold 28" -title-color: "white" - -desktop-image: "grub2-mageia-default.png" -terminal-font: "Unknown Regular 16" - -+ boot_menu { - left = 5% - top = 15% - width = 75% - height = 55% - item_font = "MageiaLogo Regular 20" - selected_item_font = "MageiaLogo Bold 20" - color_normal="black/black" - item_color = "#0e1a27" - selected_item_color = "white" - item_height = 24 - item_spacing = 10 -} - -+ progress_bar -{ - id = "__timeout__" - left = 20% - top = 70% - width = 60% - height = 2% - fg_color = "lightskyblue" - bg_color = "dodgerblue" - border_color = "midnightblue" -} - -# Informational message bar. -+ vbox { - left = 10% - top = 84%-35 - width = 50% - height = 35 - + label { - text="Select an item with the arrow keys and press Enter to boot." - font="MageiaLogo Bold 16" color="white" - } - + label { - text="Press 'c' for command line, 'e' to edit." - font="MageiaLogo Bold 16" color="white" - } -} -- cgit v1.2.1