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 0000000..08238d5 Binary files /dev/null and b/files_to_inject/boot/grub/theme/logo.png differ diff --git a/files_to_inject/boot/grub/theme/yunohost b/files_to_inject/boot/grub/theme/yunohost new file mode 100644 index 0000000..14fcfa3 --- /dev/null +++ b/files_to_inject/boot/grub/theme/yunohost @@ -0,0 +1,52 @@ +title-color: "white" +title-text: "" +title-font: "Sans Regular 16" +desktop-color: "black" +message-color: "white" +message-bg-color: "black" +terminal-font: "Sans Regular 12" + ++ boot_menu { + left = 20% + width = 60% + top = 260 + height = 200 + item_font = "Sans Regular 12" + item_color = "white" + selected_item_color = "black" + selected_item_pixmap_style = "hl_*.png" + item_height = 20 + item_padding = 15 + item_spacing = 10 +} + ++ image { + top = 20 + left = 50%-123 + width = 246 + height = 246 + file = "logo.png" +} + ++ vbox { + top = 100%-60 + left = 10% + + hbox { + top = 0 + left = 20% + + label {text = "Enter: " font = "Sans 10" color = "white" align = "left"} + + label {text = "Select " font = "Sans 10" color = "#c0c0c0" align = "left"} + + label {text = " " font = "Sans 10" color = "white" align = "left"} + + label {text = "Esc: " font = "Sans 10" color = "white" align = "left"} + + label {text = "Back up one level " font = "Sans 10" color = "#c0c0c0" align = "left"} + } + + hbox { + top = 0 + left = 20% + + label {text = "E: " font = "Sans 10" color = "white" align = "left"} + + label {text = "Edit Selection " font = "Sans 10" color = "#c0c0c0" align = "left"} + + label {text = " " font = "Sans 10" color = "white" align = "left"} + + label {text = "C: " font = "Sans 10" color = "white" align = "left"} + + label {text = "GRUB Command line" font = "Sans 10" color = "#c0c0c0" align = "left"} + } +} diff --git a/files_to_inject/isolinux/splash.png b/files_to_inject/isolinux/splash.png index 4b93b6a..d8bbdb7 100644 Binary files a/files_to_inject/isolinux/splash.png and b/files_to_inject/isolinux/splash.png differ diff --git a/iso/injection.py b/iso/injection.py index da4db04..ac3efe6 100644 --- a/iso/injection.py +++ b/iso/injection.py @@ -493,15 +493,19 @@ def inject_files_into_iso( os.system(f"rm -rf '{path_to_extracted_iso_dir}/install.{arch}/xen'") os.system(f"chmod -w '{path_to_extracted_iso_dir}/install.{arch}'") - # ADd the input files to the extracted ISO + # Add the input files to the extracted ISO os.system(f"chmod +w {path_to_extracted_iso_dir}/boot/grub") os.system(f"chmod +w {path_to_extracted_iso_dir}/boot/grub/grub.cfg") + os.system(f"chmod +w {path_to_extracted_iso_dir}/boot/grub/theme") os.system(f"chmod -R +w {path_to_extracted_iso_dir}/isolinux") + os.system(f"cp -r ./files_to_inject/* {path_to_extracted_iso_dir}/") os.system(f'sed "s@__ARCH__@{arch}@g" -i "{path_to_extracted_iso_dir}/isolinux/menu.cfg"') os.system(f'sed "s@__DIST__@{dist}@g" -i "{path_to_extracted_iso_dir}/preseeds/"*') os.system(f'sed "s@__TESTING__@{testing}@g" -i "{path_to_extracted_iso_dir}/preseeds/"*') + os.system(f"chmod -w {path_to_extracted_iso_dir}/boot/grub") + os.system(f"chmod -w -R {path_to_extracted_iso_dir}/boot/grub/theme") os.system(f"chmod -w {path_to_extracted_iso_dir}/boot/grub/grub.cfg") os.system(f"chmod -R -w {path_to_extracted_iso_dir}/isolinux") os.system(f"chmod -R -w {path_to_extracted_iso_dir}/preseeds")