From ecb9364bd285af2d63f54a2f4b7466a472713d93 Mon Sep 17 00:00:00 2001 From: 2Shirt <2xShirt@gmail.com> Date: Sat, 29 Sep 2018 15:22:01 -0600 Subject: [PATCH] Updated Syslinux menus * Added AMD microcode (fixes issue #61) * Disabled copytoram when booting from an ISO/DVD * Removed Extras menu and instead list all options from the start --- .linux_items/include/syslinux/wk.cfg | 5 ++- .linux_items/include/syslinux/wk_iso.cfg | 6 ++++ .../include/syslinux/wk_iso_linux.cfg | 31 +++++++++++++++++++ .linux_items/include/syslinux/wk_pxe.cfg | 2 +- .../include/syslinux/wk_pxe_extras.cfg | 9 ------ .../include/syslinux/wk_pxe_extras_entry.cfg | 7 ----- .../include/syslinux/wk_pxe_linux.cfg | 28 +++++++++++++++-- .../include/syslinux/wk_pxe_linux_extras.cfg | 21 ------------- .../include/syslinux/wk_pxe_winpe.cfg | 2 +- .linux_items/include/syslinux/wk_sys.cfg | 2 +- .../include/syslinux/wk_sys_extras.cfg | 8 ----- .../include/syslinux/wk_sys_extras_entry.cfg | 7 ----- .../include/syslinux/wk_sys_linux.cfg | 24 +++++++++++++- .../include/syslinux/wk_sys_linux_extras.cfg | 21 ------------- 14 files changed, 92 insertions(+), 81 deletions(-) create mode 100644 .linux_items/include/syslinux/wk_iso.cfg create mode 100644 .linux_items/include/syslinux/wk_iso_linux.cfg delete mode 100644 .linux_items/include/syslinux/wk_pxe_extras.cfg delete mode 100644 .linux_items/include/syslinux/wk_pxe_extras_entry.cfg delete mode 100644 .linux_items/include/syslinux/wk_pxe_linux_extras.cfg delete mode 100644 .linux_items/include/syslinux/wk_sys_extras.cfg delete mode 100644 .linux_items/include/syslinux/wk_sys_extras_entry.cfg delete mode 100644 .linux_items/include/syslinux/wk_sys_linux_extras.cfg diff --git a/.linux_items/include/syslinux/wk.cfg b/.linux_items/include/syslinux/wk.cfg index b9163e25..f37655df 100644 --- a/.linux_items/include/syslinux/wk.cfg +++ b/.linux_items/include/syslinux/wk.cfg @@ -2,7 +2,10 @@ DEFAULT select LABEL select COM32 boot/syslinux/whichsys.c32 -APPEND -pxe- pxe -sys- sys -iso- sys +APPEND -pxe- pxe -sys- sys -iso- iso + +LABEL iso +CONFIG boot/syslinux/wk_iso.cfg LABEL pxe CONFIG boot/syslinux/wk_pxe.cfg diff --git a/.linux_items/include/syslinux/wk_iso.cfg b/.linux_items/include/syslinux/wk_iso.cfg new file mode 100644 index 00000000..fa35a1b6 --- /dev/null +++ b/.linux_items/include/syslinux/wk_iso.cfg @@ -0,0 +1,6 @@ +INCLUDE boot/syslinux/wk_head.cfg + +INCLUDE boot/syslinux/wk_iso_linux.cfg +#DISABLED_UPSTREAM_BUG#INCLUDE boot/syslinux/wk_hdt.cfg + +INCLUDE boot/syslinux/wk_tail.cfg diff --git a/.linux_items/include/syslinux/wk_iso_linux.cfg b/.linux_items/include/syslinux/wk_iso_linux.cfg new file mode 100644 index 00000000..3f2c3556 --- /dev/null +++ b/.linux_items/include/syslinux/wk_iso_linux.cfg @@ -0,0 +1,31 @@ +LABEL wk_iso_linux +TEXT HELP +A live Linux environment + * HW diagnostics, file-based backups, data recovery, etc +ENDTEXT +MENU LABEL Linux +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% quiet loglevel=3 + +LABEL wk_iso_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% quiet loglevel=3 i3 +SYSAPPEND 3 + +LABEL wk_iso_linux_cli +TEXT HELP +A live Linux environment (CLI) + * HW diagnostics, file-based backups, data recovery, etc +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% nox nomodeset +SYSAPPEND 3 diff --git a/.linux_items/include/syslinux/wk_pxe.cfg b/.linux_items/include/syslinux/wk_pxe.cfg index 92af00e3..f8a78220 100644 --- a/.linux_items/include/syslinux/wk_pxe.cfg +++ b/.linux_items/include/syslinux/wk_pxe.cfg @@ -3,6 +3,6 @@ MENU BACKGROUND pxelinux.png INCLUDE boot/syslinux/wk_pxe_linux.cfg #UFD#INCLUDE boot/syslinux/wk_pxe_winpe.cfg -INCLUDE boot/syslinux/wk_pxe_extras_entry.cfg +#DISABLED_UPSTREAM_BUG#INCLUDE boot/syslinux/wk_hdt.cfg INCLUDE boot/syslinux/wk_tail.cfg diff --git a/.linux_items/include/syslinux/wk_pxe_extras.cfg b/.linux_items/include/syslinux/wk_pxe_extras.cfg deleted file mode 100644 index f4118570..00000000 --- a/.linux_items/include/syslinux/wk_pxe_extras.cfg +++ /dev/null @@ -1,9 +0,0 @@ -INCLUDE boot/syslinux/wk_head.cfg -MENU BACKGROUND pxelinux.png - -INCLUDE boot/syslinux/wk_pxe_linux.cfg -INCLUDE boot/syslinux/wk_pxe_linux_extras.cfg -#UFD#INCLUDE boot/syslinux/wk_pxe_winpe.cfg -#DISABLED_UPSTREAM_BUG#INCLUDE boot/syslinux/wk_hdt.cfg - -INCLUDE boot/syslinux/wk_tail.cfg diff --git a/.linux_items/include/syslinux/wk_pxe_extras_entry.cfg b/.linux_items/include/syslinux/wk_pxe_extras_entry.cfg deleted file mode 100644 index ec76c263..00000000 --- a/.linux_items/include/syslinux/wk_pxe_extras_entry.cfg +++ /dev/null @@ -1,7 +0,0 @@ -LABEL wk_pxe_extras -TEXT HELP -Show extra boot options -ENDTEXT -MENU LABEL Extras -KERNEL vesamenu.c32 -APPEND boot/syslinux/wk_pxe_extras.cfg diff --git a/.linux_items/include/syslinux/wk_pxe_linux.cfg b/.linux_items/include/syslinux/wk_pxe_linux.cfg index f7bf816d..d2468e03 100644 --- a/.linux_items/include/syslinux/wk_pxe_linux.cfg +++ b/.linux_items/include/syslinux/wk_pxe_linux.cfg @@ -3,8 +3,30 @@ TEXT HELP A live Linux environment * HW diagnostics, file-based backups, data recovery, etc ENDTEXT -MENU LABEL Linux +MENU LABEL Linux (PXE) LINUX boot/x86_64/vmlinuz -INITRD boot/intel_ucode.img,boot/x86_64/archiso.img -APPEND archisobasedir=%INSTALL_DIR% archiso_http_srv=http://${pxeserver}/ quiet +INITRD boot/intel_ucode.img,boot/amd_ucode.img,boot/x86_64/archiso.img +APPEND archisobasedir=%INSTALL_DIR% archiso_http_srv=http://${pxeserver}/ quiet loglevel=3 +SYSAPPEND 3 + +LABEL wk_http_linux_i3 +TEXT HELP +A live Linux environment (i3) + * HW diagnostics, file-based backups, data recovery, etc +ENDTEXT +MENU LABEL Linux (PXE) (i3) +LINUX boot/x86_64/vmlinuz +INITRD boot/intel_ucode.img,boot/amd_ucode.img,boot/x86_64/archiso.img +APPEND archisobasedir=%INSTALL_DIR% archiso_http_srv=http://${pxeserver}/ quiet loglevel=3 i3 +SYSAPPEND 3 + +LABEL wk_http_linux_cli +TEXT HELP +A live Linux environment (CLI) + * HW diagnostics, file-based backups, data recovery, etc +ENDTEXT +MENU LABEL Linux (PXE) (CLI) +LINUX boot/x86_64/vmlinuz +INITRD boot/intel_ucode.img,boot/amd_ucode.img,boot/x86_64/archiso.img +APPEND archisobasedir=%INSTALL_DIR% archiso_http_srv=http://${pxeserver}/ nox nomodeset SYSAPPEND 3 diff --git a/.linux_items/include/syslinux/wk_pxe_linux_extras.cfg b/.linux_items/include/syslinux/wk_pxe_linux_extras.cfg deleted file mode 100644 index f29b2724..00000000 --- a/.linux_items/include/syslinux/wk_pxe_linux_extras.cfg +++ /dev/null @@ -1,21 +0,0 @@ -LABEL wk_http_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/x86_64/archiso.img -APPEND archisobasedir=%INSTALL_DIR% archiso_http_srv=http://${pxeserver}/ quiet i3 -SYSAPPEND 3 - -LABEL wk_http_linux_cli -TEXT HELP -A live Linux environment (CLI) - * HW diagnostics, file-based backups, data recovery, etc -ENDTEXT -MENU LABEL Linux (CLI) -LINUX boot/x86_64/vmlinuz -INITRD boot/intel_ucode.img,boot/x86_64/archiso.img -APPEND archisobasedir=%INSTALL_DIR% archiso_http_srv=http://${pxeserver}/ nox nomodeset -SYSAPPEND 3 diff --git a/.linux_items/include/syslinux/wk_pxe_winpe.cfg b/.linux_items/include/syslinux/wk_pxe_winpe.cfg index 91d615d7..097df277 100644 --- a/.linux_items/include/syslinux/wk_pxe_winpe.cfg +++ b/.linux_items/include/syslinux/wk_pxe_winpe.cfg @@ -3,6 +3,6 @@ TEXT HELP A live Windows environment * Create partition backups, Install Windows, etc ENDTEXT -MENU LABEL Windows PE +MENU LABEL Windows PE (PXE) COM32 boot/syslinux/linux.c32 APPEND boot/wimboot gui initrdfile=winpe/x86_64/bootmgr,winpe/x86_64/BCD,winpe/x86_64/boot.sdi,winpe/x86_64/boot.wim diff --git a/.linux_items/include/syslinux/wk_sys.cfg b/.linux_items/include/syslinux/wk_sys.cfg index 0d375cf3..55a47e7f 100644 --- a/.linux_items/include/syslinux/wk_sys.cfg +++ b/.linux_items/include/syslinux/wk_sys.cfg @@ -2,6 +2,6 @@ INCLUDE boot/syslinux/wk_head.cfg INCLUDE boot/syslinux/wk_sys_linux.cfg #UFD#INCLUDE boot/syslinux/wk_sys_winpe.cfg -INCLUDE boot/syslinux/wk_sys_extras_entry.cfg +#DISABLED_UPSTREAM_BUG#INCLUDE boot/syslinux/wk_hdt.cfg INCLUDE boot/syslinux/wk_tail.cfg diff --git a/.linux_items/include/syslinux/wk_sys_extras.cfg b/.linux_items/include/syslinux/wk_sys_extras.cfg deleted file mode 100644 index 7f6b92cd..00000000 --- a/.linux_items/include/syslinux/wk_sys_extras.cfg +++ /dev/null @@ -1,8 +0,0 @@ -INCLUDE boot/syslinux/wk_head.cfg - -INCLUDE boot/syslinux/wk_sys_linux.cfg -INCLUDE boot/syslinux/wk_sys_linux_extras.cfg -#UFD#INCLUDE boot/syslinux/wk_sys_winpe.cfg -#DISABLED_UPSTREAM_BUG#INCLUDE boot/syslinux/wk_hdt.cfg - -INCLUDE boot/syslinux/wk_tail.cfg diff --git a/.linux_items/include/syslinux/wk_sys_extras_entry.cfg b/.linux_items/include/syslinux/wk_sys_extras_entry.cfg deleted file mode 100644 index ce8fd3ac..00000000 --- a/.linux_items/include/syslinux/wk_sys_extras_entry.cfg +++ /dev/null @@ -1,7 +0,0 @@ -LABEL wk_sys_extras -TEXT HELP -Show extra boot options -ENDTEXT -MENU LABEL Extras -KERNEL vesamenu.c32 -APPEND boot/syslinux/wk_sys_extras.cfg diff --git a/.linux_items/include/syslinux/wk_sys_linux.cfg b/.linux_items/include/syslinux/wk_sys_linux.cfg index 4b3b08c9..55b5f239 100644 --- a/.linux_items/include/syslinux/wk_sys_linux.cfg +++ b/.linux_items/include/syslinux/wk_sys_linux.cfg @@ -5,5 +5,27 @@ A live Linux environment ENDTEXT MENU LABEL Linux LINUX boot/x86_64/vmlinuz -INITRD boot/intel_ucode.img,boot/x86_64/archiso.img +INITRD boot/intel_ucode.img,boot/amd_ucode.img,boot/x86_64/archiso.img APPEND archisobasedir=%INSTALL_DIR% archisolabel=%ARCHISO_LABEL% quiet 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% quiet copytoram loglevel=3 i3 +SYSAPPEND 3 + +LABEL wk_linux_cli +TEXT HELP +A live Linux environment (CLI) + * HW diagnostics, file-based backups, data recovery, etc +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 +SYSAPPEND 3 diff --git a/.linux_items/include/syslinux/wk_sys_linux_extras.cfg b/.linux_items/include/syslinux/wk_sys_linux_extras.cfg deleted file mode 100644 index 882c705e..00000000 --- a/.linux_items/include/syslinux/wk_sys_linux_extras.cfg +++ /dev/null @@ -1,21 +0,0 @@ -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/x86_64/archiso.img -APPEND archisobasedir=%INSTALL_DIR% archisolabel=%ARCHISO_LABEL% quiet copytoram loglevel=3 i3 -SYSAPPEND 3 - -LABEL wk_linux_cli -TEXT HELP -A live Linux environment (CLI) - * HW diagnostics, file-based backups, data recovery, etc -ENDTEXT -MENU LABEL Linux (CLI) -LINUX boot/x86_64/vmlinuz -INITRD boot/intel_ucode.img,boot/x86_64/archiso.img -APPEND archisobasedir=%INSTALL_DIR% archisolabel=%ARCHISO_LABEL% copytoram nox nomodeset -SYSAPPEND 3