summaryrefslogtreecommitdiffstats
path: root/files/UEFI
diff options
context:
space:
mode:
authorMartin Whitaker <mageia@martin-whitaker.me.uk>2016-11-12 17:46:33 +0000
committerMartin Whitaker <mageia@martin-whitaker.me.uk>2016-11-12 18:19:04 +0000
commitfba8ae55ba4afd5a0bd7c96c68fb16d2ad2ace0b (patch)
tree7c69f48a7ee8fb5191ff2b8fd19c5cff896f70d4 /files/UEFI
parent8ac5299b9279d6397186a118f5bd3e943235104b (diff)
downloaddraklive-config-fba8ae55ba4afd5a0bd7c96c68fb16d2ad2ace0b.tar
draklive-config-fba8ae55ba4afd5a0bd7c96c68fb16d2ad2ace0b.tar.gz
draklive-config-fba8ae55ba4afd5a0bd7c96c68fb16d2ad2ace0b.tar.bz2
draklive-config-fba8ae55ba4afd5a0bd7c96c68fb16d2ad2ace0b.tar.xz
draklive-config-fba8ae55ba4afd5a0bd7c96c68fb16d2ad2ace0b.zip
UEFI boot: refactored files, updated theme, added options to boot with proprietary drivers.
Diffstat (limited to 'files/UEFI')
-rw-r--r--files/UEFI/EFI/BOOT/bootx64.efi (renamed from files/UEFI/GNOME/EFI/BOOT/bootx64.efi)bin802816 -> 802816 bytes
-rwxr-xr-xfiles/UEFI/EFI/BOOT/fonts/unicode.pf2 (renamed from files/UEFI/GNOME/EFI/BOOT/fonts/unicode.pf2)bin2560080 -> 2560080 bytes
-rwxr-xr-xfiles/UEFI/EFI/BOOT/themes/maggy/MageiaLogo-Bold-16.pf2bin0 -> 3602 bytes
-rwxr-xr-xfiles/UEFI/EFI/BOOT/themes/maggy/MageiaLogo-Bold-20.pf2bin0 -> 4922 bytes
-rwxr-xr-xfiles/UEFI/EFI/BOOT/themes/maggy/MageiaLogo-Bold-28.pf2 (renamed from files/UEFI/GNOME/EFI/BOOT/themes/maggy/MageiaLogo-Bold-28.pf2)bin4205 -> 6142 bytes
-rwxr-xr-xfiles/UEFI/EFI/BOOT/themes/maggy/MageiaLogo-Regular-20.pf2bin0 -> 4761 bytes
-rw-r--r--files/UEFI/EFI/BOOT/themes/maggy/grub2-mageia-default.pngbin0 -> 178033 bytes
-rwxr-xr-xfiles/UEFI/EFI/BOOT/themes/maggy/theme.txt50
-rwxr-xr-xfiles/UEFI/GNOME/EFI/BOOT/themes/maggy/Mageia5-grub2-1024x768.pngbin679782 -> 0 bytes
-rwxr-xr-xfiles/UEFI/GNOME/EFI/BOOT/themes/maggy/MageiaLogo-Bold-16.pf2bin2795 -> 0 bytes
-rwxr-xr-xfiles/UEFI/GNOME/EFI/BOOT/themes/maggy/MageiaLogo-Bold-20.pf2bin3139 -> 0 bytes
-rwxr-xr-xfiles/UEFI/GNOME/EFI/BOOT/themes/maggy/MageiaLogo-Regular-20.pf2bin2984 -> 0 bytes
-rwxr-xr-xfiles/UEFI/GNOME/EFI/BOOT/themes/maggy/theme.txt34
-rw-r--r--files/UEFI/GNOME/boot/efiboot.imgbin4194304 -> 0 bytes
-rw-r--r--files/UEFI/GNOME/grub.cfg (renamed from files/UEFI/GNOME/EFI/BOOT/grub.cfg)14
-rw-r--r--files/UEFI/PLASMA5/EFI/BOOT/bootx64.efibin802816 -> 0 bytes
-rwxr-xr-xfiles/UEFI/PLASMA5/EFI/BOOT/fonts/unicode.pf2bin2560080 -> 0 bytes
-rwxr-xr-xfiles/UEFI/PLASMA5/EFI/BOOT/themes/maggy/Mageia5-grub2-1024x768.pngbin679782 -> 0 bytes
-rwxr-xr-xfiles/UEFI/PLASMA5/EFI/BOOT/themes/maggy/MageiaLogo-Bold-16.pf2bin2795 -> 0 bytes
-rwxr-xr-xfiles/UEFI/PLASMA5/EFI/BOOT/themes/maggy/MageiaLogo-Bold-20.pf2bin3139 -> 0 bytes
-rwxr-xr-xfiles/UEFI/PLASMA5/EFI/BOOT/themes/maggy/MageiaLogo-Bold-28.pf2bin4205 -> 0 bytes
-rwxr-xr-xfiles/UEFI/PLASMA5/EFI/BOOT/themes/maggy/MageiaLogo-Regular-20.pf2bin2984 -> 0 bytes
-rwxr-xr-xfiles/UEFI/PLASMA5/EFI/BOOT/themes/maggy/theme.txt34
-rw-r--r--files/UEFI/PLASMA5/boot/efiboot.imgbin4194304 -> 0 bytes
-rw-r--r--files/UEFI/PLASMA5/grub.cfg (renamed from files/UEFI/PLASMA5/EFI/BOOT/grub.cfg)10
25 files changed, 72 insertions, 70 deletions
diff --git a/files/UEFI/GNOME/EFI/BOOT/bootx64.efi b/files/UEFI/EFI/BOOT/bootx64.efi
index bb2352c..bb2352c 100644
--- a/files/UEFI/GNOME/EFI/BOOT/bootx64.efi
+++ b/files/UEFI/EFI/BOOT/bootx64.efi
Binary files differ
diff --git a/files/UEFI/GNOME/EFI/BOOT/fonts/unicode.pf2 b/files/UEFI/EFI/BOOT/fonts/unicode.pf2
index 57b682a..57b682a 100755
--- a/files/UEFI/GNOME/EFI/BOOT/fonts/unicode.pf2
+++ b/files/UEFI/EFI/BOOT/fonts/unicode.pf2
Binary files 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..2fd329b
--- /dev/null
+++ b/files/UEFI/EFI/BOOT/themes/maggy/MageiaLogo-Bold-16.pf2
Binary files 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..6e619c9
--- /dev/null
+++ b/files/UEFI/EFI/BOOT/themes/maggy/MageiaLogo-Bold-20.pf2
Binary files differ
diff --git a/files/UEFI/GNOME/EFI/BOOT/themes/maggy/MageiaLogo-Bold-28.pf2 b/files/UEFI/EFI/BOOT/themes/maggy/MageiaLogo-Bold-28.pf2
index dee5391..605406f 100755
--- a/files/UEFI/GNOME/EFI/BOOT/themes/maggy/MageiaLogo-Bold-28.pf2
+++ b/files/UEFI/EFI/BOOT/themes/maggy/MageiaLogo-Bold-28.pf2
Binary files 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..5cb52f4
--- /dev/null
+++ b/files/UEFI/EFI/BOOT/themes/maggy/MageiaLogo-Regular-20.pf2
Binary files 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
new file mode 100644
index 0000000..df9c862
--- /dev/null
+++ b/files/UEFI/EFI/BOOT/themes/maggy/grub2-mageia-default.png
Binary files 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..598612f
--- /dev/null
+++ b/files/UEFI/EFI/BOOT/themes/maggy/theme.txt
@@ -0,0 +1,50 @@
+# 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"
+ }
+}
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
--- a/files/UEFI/GNOME/EFI/BOOT/themes/maggy/Mageia5-grub2-1024x768.png
+++ /dev/null
Binary files 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
--- a/files/UEFI/GNOME/EFI/BOOT/themes/maggy/MageiaLogo-Bold-16.pf2
+++ /dev/null
Binary files 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
--- a/files/UEFI/GNOME/EFI/BOOT/themes/maggy/MageiaLogo-Bold-20.pf2
+++ /dev/null
Binary files 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
--- a/files/UEFI/GNOME/EFI/BOOT/themes/maggy/MageiaLogo-Regular-20.pf2
+++ /dev/null
Binary files 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
--- a/files/UEFI/GNOME/boot/efiboot.img
+++ /dev/null
Binary files differ
diff --git a/files/UEFI/GNOME/EFI/BOOT/grub.cfg b/files/UEFI/GNOME/grub.cfg
index 09a1630..ed9fb7a 100644
--- a/files/UEFI/GNOME/EFI/BOOT/grub.cfg
+++ b/files/UEFI/GNOME/grub.cfg
@@ -23,11 +23,21 @@ 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
+ 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 install
+ 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/EFI/BOOT/bootx64.efi b/files/UEFI/PLASMA5/EFI/BOOT/bootx64.efi
deleted file mode 100644
index bb2352c..0000000
--- a/files/UEFI/PLASMA5/EFI/BOOT/bootx64.efi
+++ /dev/null
Binary files differ
diff --git a/files/UEFI/PLASMA5/EFI/BOOT/fonts/unicode.pf2 b/files/UEFI/PLASMA5/EFI/BOOT/fonts/unicode.pf2
deleted file mode 100755
index 57b682a..0000000
--- a/files/UEFI/PLASMA5/EFI/BOOT/fonts/unicode.pf2
+++ /dev/null
Binary files differ
diff --git a/files/UEFI/PLASMA5/EFI/BOOT/themes/maggy/Mageia5-grub2-1024x768.png b/files/UEFI/PLASMA5/EFI/BOOT/themes/maggy/Mageia5-grub2-1024x768.png
deleted file mode 100755
index 6bdaa67..0000000
--- a/files/UEFI/PLASMA5/EFI/BOOT/themes/maggy/Mageia5-grub2-1024x768.png
+++ /dev/null
Binary files differ
diff --git a/files/UEFI/PLASMA5/EFI/BOOT/themes/maggy/MageiaLogo-Bold-16.pf2 b/files/UEFI/PLASMA5/EFI/BOOT/themes/maggy/MageiaLogo-Bold-16.pf2
deleted file mode 100755
index 442e338..0000000
--- a/files/UEFI/PLASMA5/EFI/BOOT/themes/maggy/MageiaLogo-Bold-16.pf2
+++ /dev/null
Binary files differ
diff --git a/files/UEFI/PLASMA5/EFI/BOOT/themes/maggy/MageiaLogo-Bold-20.pf2 b/files/UEFI/PLASMA5/EFI/BOOT/themes/maggy/MageiaLogo-Bold-20.pf2
deleted file mode 100755
index 4a435f7..0000000
--- a/files/UEFI/PLASMA5/EFI/BOOT/themes/maggy/MageiaLogo-Bold-20.pf2
+++ /dev/null
Binary files differ
diff --git a/files/UEFI/PLASMA5/EFI/BOOT/themes/maggy/MageiaLogo-Bold-28.pf2 b/files/UEFI/PLASMA5/EFI/BOOT/themes/maggy/MageiaLogo-Bold-28.pf2
deleted file mode 100755
index dee5391..0000000
--- a/files/UEFI/PLASMA5/EFI/BOOT/themes/maggy/MageiaLogo-Bold-28.pf2
+++ /dev/null
Binary files differ
diff --git a/files/UEFI/PLASMA5/EFI/BOOT/themes/maggy/MageiaLogo-Regular-20.pf2 b/files/UEFI/PLASMA5/EFI/BOOT/themes/maggy/MageiaLogo-Regular-20.pf2
deleted file mode 100755
index f12fa75..0000000
--- a/files/UEFI/PLASMA5/EFI/BOOT/themes/maggy/MageiaLogo-Regular-20.pf2
+++ /dev/null
Binary files differ
diff --git a/files/UEFI/PLASMA5/EFI/BOOT/themes/maggy/theme.txt b/files/UEFI/PLASMA5/EFI/BOOT/themes/maggy/theme.txt
deleted file mode 100755
index 96c4581..0000000
--- a/files/UEFI/PLASMA5/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/PLASMA5/boot/efiboot.img b/files/UEFI/PLASMA5/boot/efiboot.img
deleted file mode 100644
index c05a9f5..0000000
--- a/files/UEFI/PLASMA5/boot/efiboot.img
+++ /dev/null
Binary files differ
diff --git a/files/UEFI/PLASMA5/EFI/BOOT/grub.cfg b/files/UEFI/PLASMA5/grub.cfg
index 306c24f..1f79394 100644
--- a/files/UEFI/PLASMA5/EFI/BOOT/grub.cfg
+++ b/files/UEFI/PLASMA5/grub.cfg
@@ -23,11 +23,21 @@ 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
}