switch to grub2 efi loader

36 files changed, 154 insertions, 52 deletions

diff --git a/files/UEFI/GNOME/EFI/BOOT/bootx64.efi b/files/UEFI/GNOME/EFI/BOOT/bootx64.efi
new file mode 100644
index 0000000..bb2352c
--- /dev/null
+++ b/files/UEFI/GNOME/EFI/BOOT/bootx64.efi
diff --git a/files/UEFI/GNOME/EFI/BOOT/fonts/unicode.pf2 b/files/UEFI/GNOME/EFI/BOOT/fonts/unicode.pf2
new file mode 100755
index 0000000..57b682a
--- /dev/null
+++ b/files/UEFI/GNOME/EFI/BOOT/fonts/unicode.pf2
diff --git a/files/UEFI/GNOME/EFI/BOOT/grub.cfg b/files/UEFI/GNOME/EFI/BOOT/grub.cfg
new file mode 100644
index 0000000..c32562c
--- /dev/null
+++ b/files/UEFI/GNOME/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 'Mageia-5-GNOME-LiveDVD'
+
+menuentry 'Boot Mageia 5 (Cauldron) Live' {
+        linux /boot/vmlinuz root=mgalive:LABEL=Mageia-5-GNOME-LiveDVD quiet rd.luks=0 rd.lvm=0 rd.md=0 rd.dm=0
+        initrd /boot/cdrom/initrd.gz
+}
+
+menuentry 'Install Mageia 5 (Cauldron) Live' {
+        linux /boot/vmlinuz root=mgalive:LABEL=Mageia-5-GNOME-LiveDVD quiet rd.luks=0 rd.lvm=0 rd.md=0 rd.dm=0 install
+        initrd /boot/cdrom/initrd.gz
+}
+
+menuentry 'Boot Mageia 5 (Cauldron) Live from USB' {
+        linux /boot/vmlinuz root=mgalive:LABEL=MGALIVE UEFI quiet rd.luks=0 rd.lvm=0 rd.md=0 rd.dm=0
+        initrd /boot/cdrom/initrd.gz
+}
+
+menuentry 'Install Mageia 5 (Cauldron) Live from USB' {
+        linux /boot/vmlinuz root=mgalive:LABEL=MGALIVE UEFI quiet 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
new file mode 100755
index 0000000..6bdaa67
--- /dev/null
+++ b/files/UEFI/GNOME/EFI/BOOT/themes/maggy/Mageia5-grub2-1024x768.png
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
new file mode 100755
index 0000000..442e338
--- /dev/null
+++ b/files/UEFI/GNOME/EFI/BOOT/themes/maggy/MageiaLogo-Bold-16.pf2
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
new file mode 100755
index 0000000..4a435f7
--- /dev/null
+++ b/files/UEFI/GNOME/EFI/BOOT/themes/maggy/MageiaLogo-Bold-20.pf2
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
new file mode 100755
index 0000000..dee5391
--- /dev/null
+++ b/files/UEFI/GNOME/EFI/BOOT/themes/maggy/MageiaLogo-Bold-28.pf2
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
new file mode 100755
index 0000000..f12fa75
--- /dev/null
+++ b/files/UEFI/GNOME/EFI/BOOT/themes/maggy/MageiaLogo-Regular-20.pf2
diff --git a/files/UEFI/GNOME/EFI/BOOT/themes/maggy/theme.txt b/files/UEFI/GNOME/EFI/BOOT/themes/maggy/theme.txt
new file mode 100755
index 0000000..8a5db2b
--- /dev/null
+++ b/files/UEFI/GNOME/EFI/BOOT/themes/maggy/theme.txt
@@ -0,0 +1,34 @@
+# GRUB gfxmenu theme "maggy".
+
+title-text: ""
+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 547d317..0000000
--- a/files/UEFI/GNOME/EFI/boot/bootx64.efi
+++ /dev/null
diff --git a/files/UEFI/GNOME/boot/efiboot.img b/files/UEFI/GNOME/boot/efiboot.img
index e9d71b7..c2a8971 100644
--- a/files/UEFI/GNOME/boot/efiboot.img
+++ b/files/UEFI/GNOME/boot/efiboot.img
diff --git a/files/UEFI/GNOME/loader/entries/01-mga-boot.conf b/files/UEFI/GNOME/loader/entries/01-mga-boot.conf
deleted file mode 100644
index 18ebd7a..0000000
--- a/files/UEFI/GNOME/loader/entries/01-mga-boot.conf
+++ /dev/null
@@ -1,4 +0,0 @@
-title    Boot Mageia 5 (Cauldron) Live
-linux    /boot/vmlinuz
-initrd   /boot/cdrom/initrd.gz
-options  root=mgalive:LABEL=Mageia-5-GNOME-LiveDVD quiet rd.luks=0 rd.lvm=0 rd.md=0 rd.dm=0
diff --git a/files/UEFI/GNOME/loader/entries/02-mga-install.conf b/files/UEFI/GNOME/loader/entries/02-mga-install.conf
deleted file mode 100644
index 39cc75f..0000000
--- a/files/UEFI/GNOME/loader/entries/02-mga-install.conf
+++ /dev/null
@@ -1,4 +0,0 @@
-title    Install Mageia 5 (Cauldron) Live
-linux    /boot/vmlinuz
-initrd   /boot/cdrom/initrd.gz
-options  root=mgalive:LABEL=Mageia-5-GNOME-LiveDVD quiet rd.luks=0 rd.lvm=0 rd.md=0 rd.dm=0 install
diff --git a/files/UEFI/GNOME/loader/entries/03-mga-boot-safe.conf b/files/UEFI/GNOME/loader/entries/03-mga-boot-safe.conf
deleted file mode 100644
index 8cad149..0000000
--- a/files/UEFI/GNOME/loader/entries/03-mga-boot-safe.conf
+++ /dev/null
@@ -1,4 +0,0 @@
-title    Boot Mageia 5 (Cauldron) Live (Safe mode)
-linux    /boot/vmlinuz
-initrd   /boot/cdrom/initrd.gz
-options  root=mgalive:LABEL=Mageia-5-GNOME-LiveDVD rd.luks=0 rd.lvm=0 rd.md=0 rd.dm=0 nokmsboot xdriver=vesa
diff --git a/files/UEFI/GNOME/loader/entries/04-mga-usb-boot.conf b/files/UEFI/GNOME/loader/entries/04-mga-usb-boot.conf
deleted file mode 100644
index 70713c1..0000000
--- a/files/UEFI/GNOME/loader/entries/04-mga-usb-boot.conf
+++ /dev/null
@@ -1,4 +0,0 @@
-title    Boot Mageia 5 (Cauldron) Live (from usb)
-linux    /boot/vmlinuz
-initrd   /boot/cdrom/initrd.gz
-options  root=mgalive:LABEL=MGALIVE UEFI quiet rd.luks=0 rd.lvm=0 rd.md=0 rd.dm=0
diff --git a/files/UEFI/GNOME/loader/entries/05-mga-usb-install.conf b/files/UEFI/GNOME/loader/entries/05-mga-usb-install.conf
deleted file mode 100644
index 6602012..0000000
--- a/files/UEFI/GNOME/loader/entries/05-mga-usb-install.conf
+++ /dev/null
@@ -1,4 +0,0 @@
-title    Install Mageia 5 (Cauldron) Live (from usb)
-linux    /boot/vmlinuz
-initrd   /boot/cdrom/initrd.gz
-options  root=mgalive:LABEL=MGALIVE UEFI quiet rd.luks=0 rd.lvm=0 rd.md=0 rd.dm=0 install
diff --git a/files/UEFI/GNOME/loader/entries/06-mga-usb-boot-safe.conf b/files/UEFI/GNOME/loader/entries/06-mga-usb-boot-safe.conf
deleted file mode 100644
index 7a74e20..0000000
--- a/files/UEFI/GNOME/loader/entries/06-mga-usb-boot-safe.conf
+++ /dev/null
@@ -1,4 +0,0 @@
-title    Boot Mageia 5 (Cauldron) Live (Safe mode, from usb)
-linux    /boot/vmlinuz
-initrd   /boot/cdrom/initrd.gz
-options  root=mgalive:LABEL=MGALIVE UEFI rd.luks=0 rd.lvm=0 rd.md=0 rd.dm=0 nokmsboot xdriver=vesa
diff --git a/files/UEFI/GNOME/loader/loader.conf b/files/UEFI/GNOME/loader/loader.conf
deleted file mode 100644
index da28360..0000000
--- a/files/UEFI/GNOME/loader/loader.conf
+++ /dev/null
@@ -1,2 +0,0 @@
-timeout 10
-default 01-mga-boot
diff --git a/files/UEFI/KDE4/EFI/BOOT/bootx64.efi b/files/UEFI/KDE4/EFI/BOOT/bootx64.efi
new file mode 100644
index 0000000..bb2352c
--- /dev/null
+++ b/files/UEFI/KDE4/EFI/BOOT/bootx64.efi
diff --git a/files/UEFI/KDE4/EFI/BOOT/fonts/unicode.pf2 b/files/UEFI/KDE4/EFI/BOOT/fonts/unicode.pf2
new file mode 100755
index 0000000..57b682a
--- /dev/null
+++ b/files/UEFI/KDE4/EFI/BOOT/fonts/unicode.pf2
diff --git a/files/UEFI/KDE4/EFI/BOOT/grub.cfg b/files/UEFI/KDE4/EFI/BOOT/grub.cfg
new file mode 100644
index 0000000..b23fdda
--- /dev/null
+++ b/files/UEFI/KDE4/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 'Mageia-5-KDE4-LiveDVD'
+
+menuentry 'Boot Mageia 5 (Cauldron) Live' {
+        linux /boot/vmlinuz root=mgalive:LABEL=Mageia-5-KDE4-LiveDVD quiet rd.luks=0 rd.lvm=0 rd.md=0 rd.dm=0
+        initrd /boot/cdrom/initrd.gz
+}
+
+menuentry 'Install Mageia 5 (Cauldron) Live' {
+        linux /boot/vmlinuz root=mgalive:LABEL=Mageia-5-KDE4-LiveDVD quiet rd.luks=0 rd.lvm=0 rd.md=0 rd.dm=0 install
+        initrd /boot/cdrom/initrd.gz
+}
+
+menuentry 'Boot Mageia 5 (Cauldron) Live from USB' {
+        linux /boot/vmlinuz root=mgalive:LABEL=MGALIVE UEFI quiet rd.luks=0 rd.lvm=0 rd.md=0 rd.dm=0
+        initrd /boot/cdrom/initrd.gz
+}
+
+menuentry 'Install Mageia 5 (Cauldron) Live from USB' {
+        linux /boot/vmlinuz root=mgalive:LABEL=MGALIVE UEFI quiet 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
new file mode 100755
index 0000000..6bdaa67
--- /dev/null
+++ b/files/UEFI/KDE4/EFI/BOOT/themes/maggy/Mageia5-grub2-1024x768.png
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
new file mode 100755
index 0000000..442e338
--- /dev/null
+++ b/files/UEFI/KDE4/EFI/BOOT/themes/maggy/MageiaLogo-Bold-16.pf2
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
new file mode 100755
index 0000000..4a435f7
--- /dev/null
+++ b/files/UEFI/KDE4/EFI/BOOT/themes/maggy/MageiaLogo-Bold-20.pf2
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
new file mode 100755
index 0000000..dee5391
--- /dev/null
+++ b/files/UEFI/KDE4/EFI/BOOT/themes/maggy/MageiaLogo-Bold-28.pf2
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
new file mode 100755
index 0000000..f12fa75
--- /dev/null
+++ b/files/UEFI/KDE4/EFI/BOOT/themes/maggy/MageiaLogo-Regular-20.pf2
diff --git a/files/UEFI/KDE4/EFI/BOOT/themes/maggy/theme.txt b/files/UEFI/KDE4/EFI/BOOT/themes/maggy/theme.txt
new file mode 100755
index 0000000..8a5db2b
--- /dev/null
+++ b/files/UEFI/KDE4/EFI/BOOT/themes/maggy/theme.txt
@@ -0,0 +1,34 @@
+# GRUB gfxmenu theme "maggy".
+
+title-text: ""
+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/EFI/boot/bootx64.efi b/files/UEFI/KDE4/EFI/boot/bootx64.efi
deleted file mode 100644
index 547d317..0000000
--- a/files/UEFI/KDE4/EFI/boot/bootx64.efi
+++ /dev/null
diff --git a/files/UEFI/KDE4/boot/efiboot.img b/files/UEFI/KDE4/boot/efiboot.img
index 3369228..03c99c3 100644
--- a/files/UEFI/KDE4/boot/efiboot.img
+++ b/files/UEFI/KDE4/boot/efiboot.img
diff --git a/files/UEFI/KDE4/loader/entries/01-mga-boot.conf b/files/UEFI/KDE4/loader/entries/01-mga-boot.conf
deleted file mode 100644
index 7f3a034..0000000
--- a/files/UEFI/KDE4/loader/entries/01-mga-boot.conf
+++ /dev/null
@@ -1,4 +0,0 @@
-title    Boot Mageia 5 (Cauldron) Live
-linux    /boot/vmlinuz
-initrd   /boot/cdrom/initrd.gz
-options  root=mgalive:LABEL=Mageia-5-KDE4-LiveDVD quiet rd.luks=0 rd.lvm=0 rd.md=0 rd.dm=0
diff --git a/files/UEFI/KDE4/loader/entries/02-mga-install.conf b/files/UEFI/KDE4/loader/entries/02-mga-install.conf
deleted file mode 100644
index a222cc0..0000000
--- a/files/UEFI/KDE4/loader/entries/02-mga-install.conf
+++ /dev/null
@@ -1,4 +0,0 @@
-title    Install Mageia 5 (Cauldron) Live
-linux    /boot/vmlinuz
-initrd   /boot/cdrom/initrd.gz
-options  root=mgalive:LABEL=Mageia-5-KDE4-LiveDVD quiet rd.luks=0 rd.lvm=0 rd.md=0 rd.dm=0 install
diff --git a/files/UEFI/KDE4/loader/entries/03-mga-boot-safe.conf b/files/UEFI/KDE4/loader/entries/03-mga-boot-safe.conf
deleted file mode 100644
index 6c76241..0000000
--- a/files/UEFI/KDE4/loader/entries/03-mga-boot-safe.conf
+++ /dev/null
@@ -1,4 +0,0 @@
-title    Boot Mageia 5 (Cauldron) Live (Safe mode)
-linux    /boot/vmlinuz
-initrd   /boot/cdrom/initrd.gz
-options  root=mgalive:LABEL=Mageia-5-KDE4-LiveDVD rd.luks=0 rd.lvm=0 rd.md=0 rd.dm=0 nokmsboot xdriver=vesa
diff --git a/files/UEFI/KDE4/loader/entries/04-mga-usb-boot.conf b/files/UEFI/KDE4/loader/entries/04-mga-usb-boot.conf
deleted file mode 100644
index 70713c1..0000000
--- a/files/UEFI/KDE4/loader/entries/04-mga-usb-boot.conf
+++ /dev/null
@@ -1,4 +0,0 @@
-title    Boot Mageia 5 (Cauldron) Live (from usb)
-linux    /boot/vmlinuz
-initrd   /boot/cdrom/initrd.gz
-options  root=mgalive:LABEL=MGALIVE UEFI quiet rd.luks=0 rd.lvm=0 rd.md=0 rd.dm=0
diff --git a/files/UEFI/KDE4/loader/entries/05-mga-usb-install.conf b/files/UEFI/KDE4/loader/entries/05-mga-usb-install.conf
deleted file mode 100644
index 6602012..0000000
--- a/files/UEFI/KDE4/loader/entries/05-mga-usb-install.conf
+++ /dev/null
@@ -1,4 +0,0 @@
-title    Install Mageia 5 (Cauldron) Live (from usb)
-linux    /boot/vmlinuz
-initrd   /boot/cdrom/initrd.gz
-options  root=mgalive:LABEL=MGALIVE UEFI quiet rd.luks=0 rd.lvm=0 rd.md=0 rd.dm=0 install
diff --git a/files/UEFI/KDE4/loader/entries/06-mga-usb-boot-safe.conf b/files/UEFI/KDE4/loader/entries/06-mga-usb-boot-safe.conf
deleted file mode 100644
index 7a74e20..0000000
--- a/files/UEFI/KDE4/loader/entries/06-mga-usb-boot-safe.conf
+++ /dev/null
@@ -1,4 +0,0 @@
-title    Boot Mageia 5 (Cauldron) Live (Safe mode, from usb)
-linux    /boot/vmlinuz
-initrd   /boot/cdrom/initrd.gz
-options  root=mgalive:LABEL=MGALIVE UEFI rd.luks=0 rd.lvm=0 rd.md=0 rd.dm=0 nokmsboot xdriver=vesa
diff --git a/files/UEFI/KDE4/loader/loader.conf b/files/UEFI/KDE4/loader/loader.conf
deleted file mode 100644
index da28360..0000000
--- a/files/UEFI/KDE4/loader/loader.conf
+++ /dev/null
@@ -1,2 +0,0 @@
-timeout 10
-default 01-mga-boot