diff --git a/setup/linux/profile/EFI/boot/icons/dgpu.png b/setup/linux/profile/EFI/boot/icons/dgpu.png deleted file mode 100644 index e9770abd..00000000 Binary files a/setup/linux/profile/EFI/boot/icons/dgpu.png and /dev/null differ diff --git a/setup/linux/profile/EFI/boot/icons/wk_arch.png b/setup/linux/profile/EFI/boot/icons/wk_arch.png deleted file mode 100644 index f417362e..00000000 Binary files a/setup/linux/profile/EFI/boot/icons/wk_arch.png and /dev/null differ diff --git a/setup/linux/profile/EFI/boot/icons/wk_mac_10.11.png b/setup/linux/profile/EFI/boot/icons/wk_mac_10.11.png deleted file mode 100644 index 4f72533b..00000000 Binary files a/setup/linux/profile/EFI/boot/icons/wk_mac_10.11.png and /dev/null differ diff --git a/setup/linux/profile/EFI/boot/icons/wk_mac_10.13.png b/setup/linux/profile/EFI/boot/icons/wk_mac_10.13.png deleted file mode 100644 index 5886172a..00000000 Binary files a/setup/linux/profile/EFI/boot/icons/wk_mac_10.13.png and /dev/null differ diff --git a/setup/linux/profile/EFI/boot/icons/wk_mac_10.15.png b/setup/linux/profile/EFI/boot/icons/wk_mac_10.15.png deleted file mode 100644 index 5e8d925c..00000000 Binary files a/setup/linux/profile/EFI/boot/icons/wk_mac_10.15.png and /dev/null differ diff --git a/setup/linux/profile/EFI/boot/icons/wk_mac_11.png b/setup/linux/profile/EFI/boot/icons/wk_mac_11.png deleted file mode 100644 index 2e56f7c8..00000000 Binary files a/setup/linux/profile/EFI/boot/icons/wk_mac_11.png and /dev/null differ diff --git a/setup/linux/profile/EFI/boot/icons/wk_memtest.png b/setup/linux/profile/EFI/boot/icons/wk_memtest.png deleted file mode 100644 index 927930f9..00000000 Binary files a/setup/linux/profile/EFI/boot/icons/wk_memtest.png and /dev/null differ diff --git a/setup/linux/profile/EFI/boot/icons/wk_win.png b/setup/linux/profile/EFI/boot/icons/wk_win.png deleted file mode 100644 index d086d20c..00000000 Binary files a/setup/linux/profile/EFI/boot/icons/wk_win.png and /dev/null differ diff --git a/setup/linux/profile/EFI/boot/refind.conf b/setup/linux/profile/EFI/boot/refind.conf deleted file mode 100644 index 243d3c1b..00000000 --- a/setup/linux/profile/EFI/boot/refind.conf +++ /dev/null @@ -1,87 +0,0 @@ -# refind.conf - -timeout 0 -scanfor manual -showtools firmware,reboot,shutdown -default_selection Linux -csr_values 10,77 -#use_graphics_for osx,linux,windows - -# Theme -banner rEFInd.png -banner_scale fillscreen -selection_big selection_big.png -selection_small selection_small.png -hideui arrows,badges - -# Entries -menuentry "Linux" { - icon /EFI/boot/icons/wk_arch.png - loader /arch/boot/x86_64/vmlinuz-linux - initrd /arch/boot/intel_ucode.img - initrd /arch/boot/amd_ucode.img - initrd /arch/boot/x86_64/initramfs-linux.img - options "archisobasedir=arch archisolabel=%ARCHISO_LABEL% copytoram loglevel=3" - submenuentry "Linux (CLI)" { - add_options "nox" - } -} - -menuentry "MemTest86+" { - icon /EFI/boot/icons/wk_memtest.png - options "nobigstatus nopause" - loader /EFI/memtest86+/bootx64.efi - submenuentry "Memtest86+ (Open Source)" { - loader /EFI/memtest86+/bootx64.efi - } - submenuentry "Memtest86 (Passmark)" { - loader /EFI/memtest86/bootx64.efi - options - } -} - -#UFD-MACOS-10.11#menuentry "macOS (El Capitan)" { -#UFD-MACOS-10.11# icon /EFI/boot/icons/wk_mac_10.11.png -#UFD-MACOS-10.11# volume "PARTUUID" -#UFD-MACOS-10.11# loader /System/Library/CoreServices/secretboot.efi -#UFD-MACOS-10.11# graphics -#UFD-MACOS-10.11# submenuentry "Mac MemTest" { -#UFD-MACOS-10.11# add_options "-s" -#UFD-MACOS-10.11# } -#UFD-MACOS-10.11#} - -#UFD-MACOS-10.13#menuentry "macOS (High Sierra)" { -#UFD-MACOS-10.13# icon /EFI/boot/icons/wk_mac_10.13.png -#UFD-MACOS-10.13# volume "PARTUUID" -#UFD-MACOS-10.13# loader /System/Library/CoreServices/secretboot.efi -#UFD-MACOS-10.13# graphics -#UFD-MACOS-10.13# submenuentry "Mac MemTest" { -#UFD-MACOS-10.13# add_options "-s" -#UFD-MACOS-10.13# } -#UFD-MACOS-10.13#} - -#UFD-MACOS-10.15#menuentry "macOS (Catalina)" { -#UFD-MACOS-10.15# icon /EFI/boot/icons/wk_mac_10.15.png -#UFD-MACOS-10.15# volume "PARTUUID" -#UFD-MACOS-10.15# loader /System/Library/CoreServices/secretboot.efi -#UFD-MACOS-10.15# graphics -#UFD-MACOS-10.15# submenuentry "Mac MemTest" { -#UFD-MACOS-10.15# add_options "-s" -#UFD-MACOS-10.15# } -#UFD-MACOS-10.15#} - -#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-linux -#UFD-DGPU# initrd /arch/boot/intel_ucode.img -#UFD-DGPU# initrd /arch/boot/amd_ucode.img -#UFD-DGPU# initrd /dgpu/initramfs-linux.img -#UFD-DGPU# options "archisobasedir=dgpu archisolabel=%ARCHISO_LABEL% nomodeset" -#UFD-DGPU#} - diff --git a/setup/linux/profile/EFI/boot/selection_big.png b/setup/linux/profile/EFI/boot/selection_big.png deleted file mode 100644 index 280b47b8..00000000 Binary files a/setup/linux/profile/EFI/boot/selection_big.png and /dev/null differ diff --git a/setup/linux/profile/EFI/boot/selection_small.png b/setup/linux/profile/EFI/boot/selection_small.png deleted file mode 100644 index b52c388f..00000000 Binary files a/setup/linux/profile/EFI/boot/selection_small.png and /dev/null differ diff --git a/setup/linux/profile/grub/grub.cfg b/setup/linux/profile/grub/grub.cfg index 3486753c..16a37d19 100644 --- a/setup/linux/profile/grub/grub.cfg +++ b/setup/linux/profile/grub/grub.cfg @@ -60,19 +60,12 @@ timeout_style=menu # Menu entries -menuentry "Arch Linux install medium (%ARCH%, ${archiso_platform})" --class arch --class gnu-linux --class gnu --class os --id 'archlinux' { +menuentry "%ARCHISO_LABEL% (${archiso_platform})" --class arch --class gnu-linux --class gnu --class os --id 'archlinux' { set gfxpayload=keep linux /%INSTALL_DIR%/boot/%ARCH%/vmlinuz-linux archisobasedir=%INSTALL_DIR% archisodevice=UUID=${ARCHISO_UUID} initrd /%INSTALL_DIR%/boot/intel-ucode.img /%INSTALL_DIR%/boot/amd-ucode.img /%INSTALL_DIR%/boot/%ARCH%/initramfs-linux.img } -menuentry "Arch Linux install medium with speakup screen reader (%ARCH%, ${archiso_platform})" --hotkey s --class arch --class gnu-linux --class gnu --class os --id 'archlinux-accessibility' { - set gfxpayload=keep - linux /%INSTALL_DIR%/boot/%ARCH%/vmlinuz-linux archisobasedir=%INSTALL_DIR% archisodevice=UUID=${ARCHISO_UUID} accessibility=on - initrd /%INSTALL_DIR%/boot/intel-ucode.img /%INSTALL_DIR%/boot/amd-ucode.img /%INSTALL_DIR%/boot/%ARCH%/initramfs-linux.img -} - - if [ "${grub_platform}" == 'efi' -a "${grub_cpu}" == 'x86_64' -a -f '/boot/memtest86+/memtest.efi' ]; then menuentry 'Run Memtest86+ (RAM test)' --class memtest86 --class memtest --class gnu --class tool { set gfxpayload=800x600,1024x768 diff --git a/setup/linux/profile/grub/loopback.cfg b/setup/linux/profile/grub/loopback.cfg index 3ee0d334..79ed43e2 100644 --- a/setup/linux/profile/grub/loopback.cfg +++ b/setup/linux/profile/grub/loopback.cfg @@ -28,19 +28,12 @@ timeout_style=menu # Menu entries -menuentry "Arch Linux install medium (%ARCH%, ${archiso_platform})" --class arch --class gnu-linux --class gnu --class os --id 'archlinux' { +menuentry "%ARCHISO_LABEL% (${archiso_platform})" --class arch --class gnu-linux --class gnu --class os --id 'archlinux' { set gfxpayload=keep linux /%INSTALL_DIR%/boot/%ARCH%/vmlinuz-linux archisobasedir=%INSTALL_DIR% img_dev=UUID=${archiso_img_dev_uuid} img_loop="${iso_path}" initrd /%INSTALL_DIR%/boot/intel-ucode.img /%INSTALL_DIR%/boot/amd-ucode.img /%INSTALL_DIR%/boot/%ARCH%/initramfs-linux.img } -menuentry "Arch Linux install medium with speakup screen reader (%ARCH%, ${archiso_platform})" --hotkey s --class arch --class gnu-linux --class gnu --class os --id 'archlinux-accessibility' { - set gfxpayload=keep - linux /%INSTALL_DIR%/boot/%ARCH%/vmlinuz-linux archisobasedir=%INSTALL_DIR% img_dev=UUID=${archiso_img_dev_uuid} img_loop="${iso_path}" accessibility=on - initrd /%INSTALL_DIR%/boot/intel-ucode.img /%INSTALL_DIR%/boot/amd-ucode.img /%INSTALL_DIR%/boot/%ARCH%/initramfs-linux.img -} - - if [ "${grub_platform}" == 'efi' -a "${grub_cpu}" == 'x86_64' -a -f '/boot/memtest86+/memtest.efi' ]; then menuentry 'Run Memtest86+ (RAM test)' --class memtest86 --class memtest --class gnu --class tool { set gfxpayload=800x600,1024x768 diff --git a/setup/linux/profile/syslinux/archiso_pxe-linux.cfg b/setup/linux/profile/syslinux/archiso_pxe-linux.cfg index 305b8fd2..0c5af3d5 100644 --- a/setup/linux/profile/syslinux/archiso_pxe-linux.cfg +++ b/setup/linux/profile/syslinux/archiso_pxe-linux.cfg @@ -1,9 +1,9 @@ LABEL arch64_nbd TEXT HELP -Boot the Arch Linux install medium using NBD. -It allows you to install Arch Linux or perform system maintenance. +Boot %ARCHISO_LABEL% using NBD. + * HW diagnostics, file-based backups, data recovery, etc ENDTEXT -MENU LABEL Arch Linux install medium (x86_64, NBD) +MENU LABEL %ARCHISO_LABEL% (NBD) LINUX ::/%INSTALL_DIR%/boot/x86_64/vmlinuz-linux INITRD ::/%INSTALL_DIR%/boot/intel-ucode.img,::/%INSTALL_DIR%/boot/amd-ucode.img,::/%INSTALL_DIR%/boot/x86_64/initramfs-linux.img APPEND archisobasedir=%INSTALL_DIR% archisodevice=UUID=%ARCHISO_UUID% archiso_nbd_srv=${pxeserver} cms_verify=y @@ -11,10 +11,10 @@ SYSAPPEND 3 LABEL arch64_nfs TEXT HELP -Boot the Arch Linux live medium using NFS. -It allows you to install Arch Linux or perform system maintenance. +Boot %ARCHISO_LABEL% using NFS. + * HW diagnostics, file-based backups, data recovery, etc ENDTEXT -MENU LABEL Arch Linux install medium (x86_64, NFS) +MENU LABEL %ARCHISO_LABEL% (NFS) LINUX ::/%INSTALL_DIR%/boot/x86_64/vmlinuz-linux INITRD ::/%INSTALL_DIR%/boot/intel-ucode.img,::/%INSTALL_DIR%/boot/amd-ucode.img,::/%INSTALL_DIR%/boot/x86_64/initramfs-linux.img APPEND archisobasedir=%INSTALL_DIR% archiso_nfs_srv=${pxeserver}:/run/archiso/bootmnt cms_verify=y @@ -22,10 +22,10 @@ SYSAPPEND 3 LABEL arch64_http TEXT HELP -Boot the Arch Linux live medium using HTTP. -It allows you to install Arch Linux or perform system maintenance. +Boot %ARCHISO_LABEL% using HTTP. + * HW diagnostics, file-based backups, data recovery, etc ENDTEXT -MENU LABEL Arch Linux install medium (x86_64, HTTP) +MENU LABEL %ARCHISO_LABEL% (HTTP) LINUX ::/%INSTALL_DIR%/boot/x86_64/vmlinuz-linux INITRD ::/%INSTALL_DIR%/boot/intel-ucode.img,::/%INSTALL_DIR%/boot/amd-ucode.img,::/%INSTALL_DIR%/boot/x86_64/initramfs-linux.img APPEND archisobasedir=%INSTALL_DIR% archiso_http_srv=http://${pxeserver}/ cms_verify=y diff --git a/setup/linux/profile/syslinux/archiso_sys-linux.cfg b/setup/linux/profile/syslinux/archiso_sys-linux.cfg index 950dc48c..3ec51e85 100644 --- a/setup/linux/profile/syslinux/archiso_sys-linux.cfg +++ b/setup/linux/profile/syslinux/archiso_sys-linux.cfg @@ -1,20 +1,9 @@ LABEL arch64 TEXT HELP -Boot the Arch Linux install medium on BIOS. -It allows you to install Arch Linux or perform system maintenance. +Boot %ARCHISO_LABEL% on BIOS. + * HW diagnostics, file-based backups, data recovery, etc ENDTEXT -MENU LABEL Arch Linux install medium (x86_64, BIOS) +MENU LABEL %ARCHISO_LABEL% (BIOS) LINUX /%INSTALL_DIR%/boot/x86_64/vmlinuz-linux INITRD /%INSTALL_DIR%/boot/intel-ucode.img,/%INSTALL_DIR%/boot/amd-ucode.img,/%INSTALL_DIR%/boot/x86_64/initramfs-linux.img APPEND archisobasedir=%INSTALL_DIR% archisodevice=UUID=%ARCHISO_UUID% - -# Accessibility boot option -LABEL arch64speech -TEXT HELP -Boot the Arch Linux install medium on BIOS with speakup screen reader. -It allows you to install Arch Linux or perform system maintenance with speech feedback. -ENDTEXT -MENU LABEL Arch Linux install medium (x86_64, BIOS) with ^speech -LINUX /%INSTALL_DIR%/boot/x86_64/vmlinuz-linux -INITRD /%INSTALL_DIR%/boot/intel-ucode.img,/%INSTALL_DIR%/boot/amd-ucode.img,/%INSTALL_DIR%/boot/x86_64/initramfs-linux.img -APPEND archisobasedir=%INSTALL_DIR% archisodevice=UUID=%ARCHISO_UUID% accessibility=on diff --git a/setup/linux/profile/syslinux/splash.png b/setup/linux/profile/syslinux/splash.png deleted file mode 100644 index 64b959a6..00000000 Binary files a/setup/linux/profile/syslinux/splash.png and /dev/null differ