From e1af4f41374bd48fc21db9a133696cc65c83b10f Mon Sep 17 00:00:00 2001 From: Alexandre Aubin Date: Sat, 28 Sep 2024 18:59:34 +0200 Subject: [PATCH] Followup of previous commit, tweaks to have a proper install menu on EFI system --- files_to_inject/boot/grub/grub.cfg | 9 ++-- files_to_inject/boot/grub/theme/logo.png | Bin 0 -> 6545 bytes files_to_inject/boot/grub/theme/yunohost | 52 +++++++++++++++++++++++ files_to_inject/isolinux/splash.png | Bin 1717 -> 7288 bytes iso/injection.py | 6 ++- 5 files changed, 60 insertions(+), 7 deletions(-) create mode 100644 files_to_inject/boot/grub/theme/logo.png create mode 100644 files_to_inject/boot/grub/theme/yunohost diff --git a/files_to_inject/boot/grub/grub.cfg b/files_to_inject/boot/grub/grub.cfg index 757bbf4..a29042e 100644 --- a/files_to_inject/boot/grub/grub.cfg +++ b/files_to_inject/boot/grub/grub.cfg @@ -13,9 +13,6 @@ fi if background_image /isolinux/splash.png; then set color_normal=light-gray/black set color_highlight=white/black -elif background_image /splash.png; then - set color_normal=light-gray/black - set color_highlight=white/black else set menu_color_normal=cyan/blue set menu_color_highlight=white/blue @@ -23,7 +20,7 @@ fi insmod play play 960 440 1 0 4 440 1 -set theme=/boot/grub/theme/1 +set theme=/boot/grub/theme/yunohost menuentry --hotkey=g 'Graphical install' { set background_color=black linux /install.amd/vmlinuz preseed/file=/cdrom/preseeds/default.preseed vga=788 --- quiet @@ -42,7 +39,7 @@ menuentry --hotkey=s 'Install with speech synthesis' { submenu --hotkey=a 'Advanced options ...' { set menu_color_normal=cyan/blue set menu_color_highlight=white/blue - set theme=/boot/grub/theme/1-1 + set theme=/boot/grub/theme/yunohost set gfxpayload=keep menuentry '... Graphical expert install' { set background_color=black @@ -66,7 +63,7 @@ submenu --hotkey=d 'Accessible dark contrast installer menu ...' { set color_normal=white/black set color_highlight=yellow/black background_image - set theme=/boot/grub/theme/dark-1-2 + set theme=/boot/grub/theme/yunohost set gfxpayload=keep menuentry --hotkey=g '... Graphical install' { set background_color=black diff --git a/files_to_inject/boot/grub/theme/logo.png b/files_to_inject/boot/grub/theme/logo.png new file mode 100644 index 0000000000000000000000000000000000000000..08238d5542bc5d35142461dcf1571fcf8ab767e9 GIT binary patch literal 6545 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