From 8211fab1767a115d14f4d82dabd359c48a34f546 Mon Sep 17 00:00:00 2001 From: Chris Rogers Date: Fri, 18 Aug 2023 15:27:03 -0400 Subject: [PATCH] [syslinux] Update isolinux, pxelinux, openxt.cfg with the new names of the SINITs. We use the renamed versions of the bins since they'll exist on the ESP under those names. Signed-off-by: Chris Rogers --- recipes-devtools/syslinux/files/isolinux.cfg | 7 ++++--- recipes-devtools/syslinux/files/pxelinux.cfg | 10 +++++----- .../xenclient-dom0-tweaks/openxt.cfg | 2 +- 3 files changed, 10 insertions(+), 9 deletions(-) diff --git a/recipes-devtools/syslinux/files/isolinux.cfg b/recipes-devtools/syslinux/files/isolinux.cfg index 583ce28f55..5183d41223 100644 --- a/recipes-devtools/syslinux/files/isolinux.cfg +++ b/recipes-devtools/syslinux/files/isolinux.cfg @@ -5,10 +5,11 @@ PROMPT 1 TIMEOUT 20 LABEL xenclient kernel mboot.c32 - append tboot.gz min_ram=0x2000000 loglvl=all serial=115200,8n1,0x3f8 logging=serial,memory --- xen.gz flask=disabled console=com1 dom0_max_vcpus=1 com1=115200,8n1,pci dom0_mem=max:8G ucode=-1 smt=0 --- vmlinuz quiet root=/dev/ram rw start_install=new eject_cdrom=1 answerfile=/install/answers/default.ans console=hvc0 selinux=0 --- rootfs.gz --- gm45.acm --- q35.acm --- q45q43.acm --- duali.acm --- quadi.acm --- ivb_snb.acm --- xeon56.acm --- xeone7.acm --- hsw.acm --- bdw.acm --- skl.acm --- kbl.acm --- cfl.acm --- microcode_intel.bin + append tboot.gz min_ram=0x2000000 loglvl=all serial=115200,8n1,0x3f8 logging=serial,memory --- xen.gz flask=disabled console=com1 dom0_max_vcpus=1 com1=115200,8n1,pci dom0_mem=max:8G ucode=-1 smt=0 --- vmlinuz quiet root=/dev/ram rw start_install=new eject_cdrom=1 answerfile=/install/answers/default.ans console=hvc0 selinux=0 --- rootfs.gz --- snb_ivb.bin --- bdw_hsw.bin --- skl_kbl_aml.bin --- cfl_wkl_cml.bin --- cml_s.bin --- cml_s_tgp.bin --- rkls.bin --- tgl.bin --- adl.bin --- microcode_intel.bin + LABEL verbose kernel mboot.c32 - append tboot.gz min_ram=0x2000000 loglvl=all serial=115200,8n1,0x3f8 logging=serial,memory --- xen.gz flask=disabled console=com1,vga dom0_max_vcpus=1 com1=115200,8n1,pci dom0_mem=max:8G ucode=-1 smt=0 --- vmlinuz quiet root=/dev/ram rw start_install=new eject_cdrom=1 answerfile=/install/answers/default.ans console=hvc0 selinux=0 --- rootfs.gz --- gm45.acm --- q35.acm --- q45q43.acm --- duali.acm --- quadi.acm --- ivb_snb.acm --- xeon56.acm --- xeone7.acm --- hsw.acm --- bdw.acm --- skl.acm --- kbl.acm --- cfl.acm --- microcode_intel.bin + append tboot.gz min_ram=0x2000000 loglvl=all serial=115200,8n1,0x3f8 logging=serial,memory --- xen.gz flask=disabled console=com1,vga dom0_max_vcpus=1 com1=115200,8n1,pci dom0_mem=max:8G ucode=-1 smt=0 --- vmlinuz quiet root=/dev/ram rw start_install=new eject_cdrom=1 answerfile=/install/answers/default.ans console=hvc0 selinux=0 --- rootfs.gz --- snb_ivb.bin --- bdw_hsw.bin --- skl_kbl_aml.bin --- cfl_wkl_cml.bin --- cml_s.bin --- cml_s_tgp.bin --- rkls.bin --- tgl.bin --- adl.bin --- microcode_intel.bin LABEL automatic kernel mboot.c32 - append tboot.gz min_ram=0x2000000 loglvl=all serial=115200,8n1,0x3f8 logging=serial,memory --- xen.gz flask=disabled console=com1 dom0_max_vcpus=1 com1=115200,8n1,pci dom0_mem=max:8G ucode=-1 smt=0 --- vmlinuz quiet root=/dev/ram rw start_install=new eject_cdrom=1 answerfile=/install/answers/auto-cd.ans console=hvc0 selinux=0 --- rootfs.gz --- gm45.acm --- q35.acm --- q45q43.acm --- duali.acm --- quadi.acm --- ivb_snb.acm --- xeon56.acm --- xeone7.acm --- hsw.acm --- bdw.acm --- skl.acm --- kbl.acm --- cfl.acm --- microcode_intel.bin + append tboot.gz min_ram=0x2000000 loglvl=all serial=115200,8n1,0x3f8 logging=serial,memory --- xen.gz flask=disabled console=com1 dom0_max_vcpus=1 com1=115200,8n1,pci dom0_mem=max:8G ucode=-1 smt=0 --- vmlinuz quiet root=/dev/ram rw start_install=new eject_cdrom=1 answerfile=/install/answers/auto-cd.ans console=hvc0 selinux=0 --- rootfs.gz --- snb_ivb.bin --- bdw_hsw.bin --- skl_kbl_aml.bin --- cfl_wkl_cml.bin --- cml_s.bin --- cml_s_tgp.bin --- rkls.bin --- tgl.bin --- adl.bin --- microcode_intel.bin diff --git a/recipes-devtools/syslinux/files/pxelinux.cfg b/recipes-devtools/syslinux/files/pxelinux.cfg index 3bf69af339..5c5994f4d8 100644 --- a/recipes-devtools/syslinux/files/pxelinux.cfg +++ b/recipes-devtools/syslinux/files/pxelinux.cfg @@ -5,20 +5,20 @@ timeout 10 label xc-installer kernel @TFTP_PATH@/mboot.c32 - append @TFTP_PATH@/tboot.gz min_ram=0x2000000 loglvl=all serial=115200,8n1,0x3f8 logging=serial,memory --- @TFTP_PATH@/xen.gz flask=disabled console=com1,vga dom0_max_vcpus=1 com1=115200,8n1,pci dom0_mem=max:8G ucode=-1 smt=0 --- @TFTP_PATH@/vmlinuz quiet selinux=0 console=hvc0 root=/dev/ram rw start_install answerfile=tftp://dhcp/@TFTP_PATH@/network.ans --- @TFTP_PATH@/rootfs.gz --- @TFTP_PATH@/gm45.acm --- @TFTP_PATH@/q35.acm --- @TFTP_PATH@/q45q43.acm --- @TFTP_PATH@/duali.acm --- @TFTP_PATH@/quadi.acm --- @TFTP_PATH@/ivb_snb.acm --- @TFTP_PATH@/xeon56.acm --- @TFTP_PATH@/xeone7.acm --- @TFTP_PATH@/hsw.acm --- @TFTP_PATH@/bdw.acm --- @TFTP_PATH@/skl.acm --- @TFTP_PATH@/kbl.acm --- @TFTP_PATH@/cfl.acm --- @TFTP_PATH@/microcode_intel.bin + append @TFTP_PATH@/tboot.gz min_ram=0x2000000 loglvl=all serial=115200,8n1,0x3f8 logging=serial,memory --- @TFTP_PATH@/xen.gz flask=disabled console=com1,vga dom0_max_vcpus=1 com1=115200,8n1,pci dom0_mem=max:8G ucode=-1 smt=0 --- @TFTP_PATH@/vmlinuz quiet selinux=0 console=hvc0 root=/dev/ram rw start_install answerfile=tftp://dhcp/@TFTP_PATH@/network.ans --- @TFTP_PATH@/rootfs.gz --- @TFTP_PATH@/snb_ivb.bin --- @TFTP_PATH@/bdw_hsw.bin --- @TFTP_PATH@/skl_kbl_aml.bin --- @TFTP_PATH@/cfl_wkl_cml.bin --- @TFTP_PATH@/cml_s.bin --- @TFTP_PATH@/cml_s_tgp.bin -- @TFTP_PATH@/rkls.bin --- @TFTP_PATH@/tgl.bin --- @TFTP_PATH@/adl.bin --- @TFTP_PATH@/microcode_intel.bin label xc-installer-upgrade kernel @TFTP_PATH@/mboot.c32 - append @TFTP_PATH@/tboot.gz min_ram=0x2000000 loglvl=all serial=115200,8n1,0x3f8 logging=serial,memory --- @TFTP_PATH@/xen.gz flask=disabled console=com1,vga dom0_max_vcpus=1 com1=115200,8n1,pci dom0_mem=max:8G ucode=-1 smt=0 --- @TFTP_PATH@/vmlinuz quiet selinux=0 console=hvc0 root=/dev/ram rw start_install answerfile=tftp://dhcp/@TFTP_PATH@/network_upgrade.ans --- @TFTP_PATH@/rootfs.gz --- @TFTP_PATH@/gm45.acm --- @TFTP_PATH@/q35.acm --- @TFTP_PATH@/q45q43.acm --- @TFTP_PATH@/duali.acm --- @TFTP_PATH@/quadi.acm --- @TFTP_PATH@/ivb_snb.acm --- @TFTP_PATH@/xeon56.acm --- @TFTP_PATH@/xeone7.acm --- @TFTP_PATH@/hsw.acm --- @TFTP_PATH@/bdw.acm --- @TFTP_PATH@/skl.acm --- @TFTP_PATH@/kbl.acm --- @TFTP_PATH@/cfl.acm --- @TFTP_PATH@/microcode_intel.bin + append @TFTP_PATH@/tboot.gz min_ram=0x2000000 loglvl=all serial=115200,8n1,0x3f8 logging=serial,memory --- @TFTP_PATH@/xen.gz flask=disabled console=com1,vga dom0_max_vcpus=1 com1=115200,8n1,pci dom0_mem=max:8G ucode=-1 smt=0 --- @TFTP_PATH@/vmlinuz quiet selinux=0 console=hvc0 root=/dev/ram rw start_install answerfile=tftp://dhcp/@TFTP_PATH@/network_upgrade.ans --- @TFTP_PATH@/rootfs.gz --- @TFTP_PATH@/snb_ivb.bin --- @TFTP_PATH@/bdw_hsw.bin --- @TFTP_PATH@/skl_kbl_aml.bin --- @TFTP_PATH@/cfl_wkl_cml.bin --- @TFTP_PATH@/cml_s.bin --- @TFTP_PATH@/cml_s_tgp.bin -- @TFTP_PATH@/rkls.bin --- @TFTP_PATH@/tgl.bin --- @TFTP_PATH@/adl.bin --- @TFTP_PATH@/microcode_intel.bin label xc-installer-manual kernel @TFTP_PATH@/mboot.c32 - append @TFTP_PATH@/tboot.gz min_ram=0x2000000 loglvl=all serial=115200,8n1,0x3f8 logging=serial,memory --- @TFTP_PATH@/xen.gz flask=disabled console=com1,vga dom0_max_vcpus=1 com1=115200,8n1,pci dom0_mem=max:8G ucode=-1 smt=0 --- @TFTP_PATH@/vmlinuz quiet selinux=0 console=hvc0 root=/dev/ram rw start_install answerfile=tftp://dhcp/@TFTP_PATH@/network_manual.ans --- @TFTP_PATH@/rootfs.gz --- @TFTP_PATH@/gm45.acm --- @TFTP_PATH@/q35.acm --- @TFTP_PATH@/q45q43.acm --- @TFTP_PATH@/duali.acm --- @TFTP_PATH@/quadi.acm --- @TFTP_PATH@/ivb_snb.acm --- @TFTP_PATH@/xeon56.acm --- @TFTP_PATH@/xeone7.acm --- @TFTP_PATH@/hsw.acm --- @TFTP_PATH@/bdw.acm --- @TFTP_PATH@/skl.acm --- @TFTP_PATH@/kbl.acm --- @TFTP_PATH@/cfl.acm --- @TFTP_PATH@/microcode_intel.bin + append @TFTP_PATH@/tboot.gz min_ram=0x2000000 loglvl=all serial=115200,8n1,0x3f8 logging=serial,memory --- @TFTP_PATH@/xen.gz flask=disabled console=com1,vga dom0_max_vcpus=1 com1=115200,8n1,pci dom0_mem=max:8G ucode=-1 smt=0 --- @TFTP_PATH@/vmlinuz quiet selinux=0 console=hvc0 root=/dev/ram rw start_install answerfile=tftp://dhcp/@TFTP_PATH@/network_manual.ans --- @TFTP_PATH@/rootfs.gz --- @TFTP_PATH@/snb_ivb.bin --- @TFTP_PATH@/bdw_hsw.bin --- @TFTP_PATH@/skl_kbl_aml.bin --- @TFTP_PATH@/cfl_wkl_cml.bin --- @TFTP_PATH@/cml_s.bin --- @TFTP_PATH@/cml_s_tgp.bin -- @TFTP_PATH@/rkls.bin --- @TFTP_PATH@/tgl.bin --- @TFTP_PATH@/adl.bin --- @TFTP_PATH@/microcode_intel.bin label xc-installer-download-win kernel @TFTP_PATH@/mboot.c32 - append @TFTP_PATH@/tboot.gz min_ram=0x2000000 loglvl=all serial=115200,8n1,0x3f8 logging=serial,memory --- @TFTP_PATH@/xen.gz flask=disabled console=com1,vga dom0_max_vcpus=1 com1=115200,8n1,pci dom0_mem=max:8G ucode=-1 smt=0 --- @TFTP_PATH@/vmlinuz quiet selinux=0 console=hvc0 root=/dev/ram rw start_install answerfile=tftp://dhcp/@TFTP_PATH@/network_download_win.ans --- @TFTP_PATH@/rootfs.gz --- @TFTP_PATH@/gm45.acm --- @TFTP_PATH@/q35.acm --- @TFTP_PATH@/q45q43.acm --- @TFTP_PATH@/duali.acm --- @TFTP_PATH@/quadi.acm --- @TFTP_PATH@/ivb_snb.acm --- @TFTP_PATH@/xeon56.acm --- @TFTP_PATH@/xeone7.acm --- @TFTP_PATH@/hsw.acm --- @TFTP_PATH@/bdw.acm --- @TFTP_PATH@/skl.acm --- @TFTP_PATH@/kbl.acm --- @TFTP_PATH@/cfl.acm --- @TFTP_PATH@/microcode_intel.bin + append @TFTP_PATH@/tboot.gz min_ram=0x2000000 loglvl=all serial=115200,8n1,0x3f8 logging=serial,memory --- @TFTP_PATH@/xen.gz flask=disabled console=com1,vga dom0_max_vcpus=1 com1=115200,8n1,pci dom0_mem=max:8G ucode=-1 smt=0 --- @TFTP_PATH@/vmlinuz quiet selinux=0 console=hvc0 root=/dev/ram rw start_install answerfile=tftp://dhcp/@TFTP_PATH@/network_download_win.ans --- @TFTP_PATH@/rootfs.gz --- @TFTP_PATH@/snb_ivb.bin --- @TFTP_PATH@/bdw_hsw.bin --- @TFTP_PATH@/skl_kbl_aml.bin --- @TFTP_PATH@/cfl_wkl_cml.bin --- @TFTP_PATH@/cml_s.bin --- @TFTP_PATH@/cml_s_tgp.bin -- @TFTP_PATH@/rkls.bin --- @TFTP_PATH@/tgl.bin --- @TFTP_PATH@/adl.bin --- @TFTP_PATH@/microcode_intel.bin label xc-installer-manual-download-win kernel @TFTP_PATH@/mboot.c32 - append @TFTP_PATH@/tboot.gz min_ram=0x2000000 loglvl=all serial=115200,8n1,0x3f8 logging=serial,memory --- @TFTP_PATH@/xen.gz flask=disabled console=com1,vga dom0_max_vcpus=1 com1=115200,8n1,pci dom0_mem=max:8G ucode=-1 smt=0 --- @TFTP_PATH@/vmlinuz quiet selinux=0 console=hvc0 root=/dev/ram rw start_install answerfile=tftp://dhcp/@TFTP_PATH@/network_manual_download_win.ans --- @TFTP_PATH@/rootfs.gz --- @TFTP_PATH@/gm45.acm --- @TFTP_PATH@/q35.acm --- @TFTP_PATH@/q45q43.acm --- @TFTP_PATH@/duali.acm --- @TFTP_PATH@/quadi.acm --- @TFTP_PATH@/ivb_snb.acm --- @TFTP_PATH@/xeon56.acm --- @TFTP_PATH@/xeone7.acm --- @TFTP_PATH@/hsw.acm --- @TFTP_PATH@/bdw.acm --- @TFTP_PATH@/skl.acm --- @TFTP_PATH@/kbl.acm --- @TFTP_PATH@/cfl.acm --- @TFTP_PATH@/microcode_intel.bin + append @TFTP_PATH@/tboot.gz min_ram=0x2000000 loglvl=all serial=115200,8n1,0x3f8 logging=serial,memory --- @TFTP_PATH@/xen.gz flask=disabled console=com1,vga dom0_max_vcpus=1 com1=115200,8n1,pci dom0_mem=max:8G ucode=-1 smt=0 --- @TFTP_PATH@/vmlinuz quiet selinux=0 console=hvc0 root=/dev/ram rw start_install answerfile=tftp://dhcp/@TFTP_PATH@/network_manual_download_win.ans --- @TFTP_PATH@/rootfs.gz --- @TFTP_PATH@/snb_ivb.bin --- @TFTP_PATH@/bdw_hsw.bin --- @TFTP_PATH@/skl_kbl_aml.bin --- @TFTP_PATH@/cfl_wkl_cml.bin --- @TFTP_PATH@/cml_s.bin --- @TFTP_PATH@/cml_s_tgp.bin -- @TFTP_PATH@/rkls.bin --- @TFTP_PATH@/tgl.bin --- @TFTP_PATH@/adl.bin --- @TFTP_PATH@/microcode_intel.bin diff --git a/recipes-openxt/xenclient-dom0-tweaks/xenclient-dom0-tweaks/openxt.cfg b/recipes-openxt/xenclient-dom0-tweaks/xenclient-dom0-tweaks/openxt.cfg index 6fb50841f8..6451c01c0d 100644 --- a/recipes-openxt/xenclient-dom0-tweaks/xenclient-dom0-tweaks/openxt.cfg +++ b/recipes-openxt/xenclient-dom0-tweaks/xenclient-dom0-tweaks/openxt.cfg @@ -1,7 +1,7 @@ [global] default=openxt-normal tboot=tboot min_ram=0x2000000 loglvl=all serial=115200,8n1,0x3f8 logging=serial,memory -sinit=GM45_GS45_PM45_SINIT_51.BIN Q35_SINIT_51.BIN Q45_Q43_SINIT_51.BIN i5_i7_DUAL_SINIT_51.BIN i7_QUAD_SINIT_51.BIN 3rd_gen_i5_i7_SINIT_67.BIN Xeon-5600-3500-SINIT-v1.1.bin Xeon-E7-8800-4800-2800-SINIT-v1.1.bin 4th_gen_i5_i7_SINIT_75.BIN 5th_gen_i5_i7_SINIT_79.BIN 6th_gen_i5_i7_SINIT_71.BIN 7th_gen_i5_i7-SINIT_74.bin 8th_gen_i5_i7-SINIT_76.bin +sinit=snb_ivb.bin bdw_hsw.bin skl_kbl_aml.bin cfl_wkl_cml.bin cml_s.bin cml_s_tgp.bin rkls.bin tgl.bin adl.bin ucode=microcode_intel.bin [openxt-normal]