From 89ac824d828a7adf7f4c90bda0d10c27201cf795 Mon Sep 17 00:00:00 2001 From: 2Shirt <2xShirt@gmail.com> Date: Mon, 15 Apr 2019 23:44:42 -0700 Subject: [PATCH] Expanded boot entries sections * Update Arch labels from ISO_LABEL to UFD_LABEL * Added Linux (Minimal) to syslinux * Added Linux (Minimal) and Linux (dGPU) entries to rEFInd * Removed Linux (i3) entries * I guess this is a hidden feature now... --- .bin/Scripts/build-ufd | 6 +++-- .bin/Scripts/functions/ufd.py | 18 ++++++++++--- .linux_items/include/EFI/boot/icons/dgpu.png | Bin 0 -> 3086 bytes .linux_items/include/EFI/boot/refind.conf | 23 +++++++++++++--- .../include/syslinux/wk_sys_linux.cfg | 25 +++++++++--------- 5 files changed, 50 insertions(+), 22 deletions(-) create mode 100644 .linux_items/include/EFI/boot/icons/dgpu.png diff --git a/.bin/Scripts/build-ufd b/.bin/Scripts/build-ufd index 4ad726e1..646d96dd 100755 --- a/.bin/Scripts/build-ufd +++ b/.bin/Scripts/build-ufd @@ -77,10 +77,12 @@ if __name__ == '__main__': # Update boot entries try_and_print( - message='Enabling boot entries...', - function=enable_boot_entries, + message='Updating boot entries...', + function=update_boot_entries, boot_entries=BOOT_ENTRIES, boot_files=BOOT_FILES, + iso_label=ISO_LABEL, + ufd_label=UFD_LABEL, ) # Install syslinux diff --git a/.bin/Scripts/functions/ufd.py b/.bin/Scripts/functions/ufd.py index dbce5bb6..f6083da0 100644 --- a/.bin/Scripts/functions/ufd.py +++ b/.bin/Scripts/functions/ufd.py @@ -68,8 +68,8 @@ def copy_source(source, items, overwrite=False): unmount('/mnt/Source') -def enable_boot_entries(boot_entries, boot_files): - """Enable boot entries if related paths exist.""" +def update_boot_entries(boot_entries, boot_files, iso_label, ufd_label): + """Update boot files for UFD usage""" configs = [] # Find config files @@ -79,7 +79,17 @@ def enable_boot_entries(boot_entries, boot_files): if item.name.lower().endswith(c_ext.lower()): configs.append(item.path) - # Uncomment found entries + # Update Linux labels + cmd = [ + 'sed', + '--in-place', + '--regexp-extended', + 's/{}/{}/'.format(iso_label, ufd_label), + *configs, + ] + run_program(cmd) + + # Uncomment extra entries if present for b_path, b_comment in boot_entries: try: find_path('/mnt/UFD{}'.format(b_path)) @@ -87,7 +97,7 @@ def enable_boot_entries(boot_entries, boot_files): # Entry not found, continue to next entry continue - # Update config files + # Entry found, update config files cmd = [ 'sed', '--in-place', diff --git a/.linux_items/include/EFI/boot/icons/dgpu.png b/.linux_items/include/EFI/boot/icons/dgpu.png new file mode 100644 index 0000000000000000000000000000000000000000..e9770abd1ba2487b1e3d08e9a643004f94d019c3 GIT binary patch literal 3086 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 literal 0 HcmV?d00001 diff --git a/.linux_items/include/EFI/boot/refind.conf b/.linux_items/include/EFI/boot/refind.conf index 4ab3be7b..62a639f7 100644 --- a/.linux_items/include/EFI/boot/refind.conf +++ b/.linux_items/include/EFI/boot/refind.conf @@ -26,15 +26,30 @@ menuentry "Linux" { initrd /arch/boot/amd_ucode.img initrd /arch/boot/x86_64/archiso.img options "archisobasedir=arch archisolabel=%ARCHISO_LABEL% copytoram loglevel=3" - submenuentry "Linux (i3)" { - add_options "i3" - } submenuentry "Linux (CLI)" { - add_options "loglevel=4 nomodeset nox" + add_options "nox" } + #UFD-MINIMAL#submenuentry "Linux (Minimal)" { + #UFD-MINIMAL# loader /arch_minimal/vmlinuz + #UFD-MINIMAL# initrd + #UFD-MINIMAL# initrd /arch/boot/intel_ucode.img + #UFD-MINIMAL# initrd /arch/boot/amd_ucode.img + #UFD-MINIMAL# initrd /arch_minimal/archiso.img + #UFD-MINIMAL# options + #UFD-MINIMAL# options "archisobasedir=arch_minimal archisolabel=%ARCHISO_LABEL% copytoram loglevel=3" + #UFD-MINIMAL#} } #UFD-WINPE#menuentry "WindowsPE" { #UFD-WINPE# ostype windows #UFD-WINPE# icon /EFI/boot/icons/wk_win.png #UFD-WINPE# loader /EFI/microsoft/bootx64.efi #UFD-WINPE#} +#UFD-DGPU#menuentry "Mac dGPU Disable Tool" { +#UFD-DGPU# icon /EFI/boot/icons/dgpu.png +#UFD-DGPU# loader /dgpu/vmlinuz +#UFD-DGPU# initrd /arch/boot/intel_ucode.img +#UFD-DGPU# initrd /arch/boot/amd_ucode.img +#UFD-DGPU# initrd /dgpu/archiso.img +#UFD-DGPU# options "archisobasedir=dgpu archisolabel=%ARCHISO_LABEL% nomodeset" +#UFD-DGPU#} + diff --git a/.linux_items/include/syslinux/wk_sys_linux.cfg b/.linux_items/include/syslinux/wk_sys_linux.cfg index d4319c00..b6a9370c 100644 --- a/.linux_items/include/syslinux/wk_sys_linux.cfg +++ b/.linux_items/include/syslinux/wk_sys_linux.cfg @@ -8,17 +8,6 @@ LINUX boot/x86_64/vmlinuz INITRD boot/intel_ucode.img,boot/amd_ucode.img,boot/x86_64/archiso.img APPEND archisobasedir=%INSTALL_DIR% archisolabel=%ARCHISO_LABEL% copytoram loglevel=3 -LABEL wk_linux_i3 -TEXT HELP -A live Linux environment (i3) - * HW diagnostics, file-based backups, data recovery, etc -ENDTEXT -MENU LABEL Linux (i3) -LINUX boot/x86_64/vmlinuz -INITRD boot/intel_ucode.img,boot/amd_ucode.img,boot/x86_64/archiso.img -APPEND archisobasedir=%INSTALL_DIR% archisolabel=%ARCHISO_LABEL% copytoram loglevel=3 i3 -SYSAPPEND 3 - LABEL wk_linux_cli TEXT HELP A live Linux environment (CLI) @@ -27,5 +16,17 @@ ENDTEXT MENU LABEL Linux (CLI) LINUX boot/x86_64/vmlinuz INITRD boot/intel_ucode.img,boot/amd_ucode.img,boot/x86_64/archiso.img -APPEND archisobasedir=%INSTALL_DIR% archisolabel=%ARCHISO_LABEL% copytoram nox nomodeset +APPEND archisobasedir=%INSTALL_DIR% archisolabel=%ARCHISO_LABEL% copytoram nox SYSAPPEND 3 + +#UFD-MINIMAL#LABEL wk_linux_minimal +#UFD-MINIMAL#TEXT HELP +#UFD-MINIMAL#A live Linux environment (Minimal) +#UFD-MINIMAL# * HW diagnostics, file-based backups, data recovery, etc +#UFD-MINIMAL#ENDTEXT +#UFD-MINIMAL#MENU LABEL Linux (Minimal) +#UFD-MINIMAL#LINUX ../arch_minimal/vmlinuz +#UFD-MINIMAL#INITRD boot/intel_ucode.img,boot/amd_ucode.img,../arch_minimal/archiso.img +#UFD-MINIMAL#APPEND archisobasedir=arch_minimal archisolabel=%ARCHISO_LABEL% copytoram loglevel=3 +#UFD-MINIMAL#SYSAPPEND 3 +