From 4d6255510b3279518c83f860f9e15f45b23c1443 Mon Sep 17 00:00:00 2001 From: Eric MacDonald Date: Mon, 27 Jun 2022 20:51:17 +0000 Subject: [PATCH] Debian: Update System node install grub menus This update only affects system node installation. This update makes the following changes to the system node install grub menus in support of AIO DX: - add std and rt kernel specification for the specified install type - add the defaultkernel= option for the specified install type - add console=tty1 to include graphical output during install process - remove obsolete persistent iface naming net.ifnames=0 kernel option - remove unnecessary 'installer-' kernel and initrd prefix - drive option order consistenty throughout the debian menus - add kickstart directory to line up with the ISO layout Test Plan: PASS: Verify Debian build PASS: Verify graphical and serial output during install PASS: Verify AIO Controller-1 Install (standard and lowlatency) Depends-On: https://review.opendev.org/c/starlingx/metal/+/840997 Story: 2009968 Task: 45684 Signed-off-by: Eric MacDonald Change-Id: Ic3697f4762c2985e599a0955c9785df6c9973db7 --- installer/pxe-network-installer/debian/deb_folder/rules | 5 ----- .../pxe-network-installer/debian-pxe-controller-install | 6 +++--- .../pxe-network-installer/debian-pxe-smallsystem-install | 6 +++--- .../debian-pxe-smallsystem_lowlatency-install | 6 +++--- .../pxe-network-installer/debian-pxe-storage-install | 6 +++--- .../pxe-network-installer/debian-pxe-worker-install | 6 +++--- .../debian-pxe-worker_lowlatency-install | 6 +++--- .../pxe-network-installer/efi-debian-pxe-controller-install | 6 +++--- .../efi-debian-pxe-smallsystem-install | 6 +++--- .../efi-debian-pxe-smallsystem_lowlatency-install | 6 +++--- .../pxe-network-installer/efi-debian-pxe-storage-install | 6 +++--- .../pxe-network-installer/efi-debian-pxe-worker-install | 6 +++--- .../efi-debian-pxe-worker_lowlatency-install | 6 +++--- 13 files changed, 36 insertions(+), 41 deletions(-) diff --git a/installer/pxe-network-installer/debian/deb_folder/rules b/installer/pxe-network-installer/debian/deb_folder/rules index 77217da8..776cdf26 100644 --- a/installer/pxe-network-installer/debian/deb_folder/rules +++ b/installer/pxe-network-installer/debian/deb_folder/rules @@ -17,11 +17,6 @@ override_dh_install: install -v -d -m 755 $(ROOT)/var/pxeboot/rel-${platform_release} install -v -d -m 755 $(ROOT)/usr/share/licenses/pxe-network-installer-1.0.0 - # Review Note: The actual kernel and initrd files will be added later - # Pull in the kernel and initrd and add installer links. - ln -sf bzImage $(ROOT)/var/pxeboot/rel-${platform_release}/installer-bzImage - ln -sf initrd $(ROOT)/var/pxeboot/rel-${platform_release}/installer-initrd - # Add grub links install -v -m 644 default $(ROOT)/var/pxeboot/pxelinux.cfg.files/default install -v -m 644 default.static $(ROOT)/var/pxeboot/pxelinux.cfg.files/default.static diff --git a/installer/pxe-network-installer/pxe-network-installer/debian-pxe-controller-install b/installer/pxe-network-installer/pxe-network-installer/debian-pxe-controller-install index e4213201..e637262b 100644 --- a/installer/pxe-network-installer/pxe-network-installer/debian-pxe-controller-install +++ b/installer/pxe-network-installer/pxe-network-installer/debian-pxe-controller-install @@ -19,8 +19,8 @@ NOCOMPLETE 1 ALLOWOPTIONS 0 LABEL 1 - MENU LABEL ^1) Standard Controller + MENU LABEL Standard Controller MENU DEFAULT - KERNEL rel-xxxSW_VERSIONxxx/installer-bzImage - APPEND initrd=rel-xxxSW_VERSIONxxx/installer-initrd rdinit=/install traits=controller instname=debian instsh=0 instab=0 instw=10 instbr=starlingx ks=xxxBASE_URLxxx/feed/rel-xxxSW_VERSIONxxx/kickstart.cfg insturl=xxxBASE_URLxxx/feed/rel-xxxSW_VERSIONxxx/ostree_repo console=ttyS0,115200 console=tty1 biosdevname=0 net.ifnames=0 biosplusefi=1 xxxAPPEND_OPTIONSxxx + KERNEL rel-xxxSW_VERSIONxxx/bzImage-std + APPEND initrd=rel-xxxSW_VERSIONxxx/initrd rdinit=/install defaultkernel=vmlinuz-*[!t]-amd64 traits=controller instname=debian instbr=starlingx instsh=0 instab=0 ks=xxxBASE_URLxxx/feed/rel-xxxSW_VERSIONxxx/kickstart/kickstart.cfg insturl=xxxBASE_URLxxx/feed/rel-xxxSW_VERSIONxxx/ostree_repo console=ttyS0,115200 console=tty1 biosdevname=0 biosplusefi=1 xxxAPPEND_OPTIONSxxx IPAPPEND 2 diff --git a/installer/pxe-network-installer/pxe-network-installer/debian-pxe-smallsystem-install b/installer/pxe-network-installer/pxe-network-installer/debian-pxe-smallsystem-install index bd74328f..7a98ddec 100644 --- a/installer/pxe-network-installer/pxe-network-installer/debian-pxe-smallsystem-install +++ b/installer/pxe-network-installer/pxe-network-installer/debian-pxe-smallsystem-install @@ -19,8 +19,8 @@ NOCOMPLETE 1 ALLOWOPTIONS 0 LABEL 1 - MENU LABEL ^1) All-in-one + MENU LABEL All-in-one MENU DEFAULT - KERNEL rel-xxxSW_VERSIONxxx/installer-bzImage - APPEND initrd=rel-xxxSW_VERSIONxxx/installer-initrd rdinit=/install traits=controller,worker instname=debian instsh=0 instab=0 instw=10 instbr=starlingx ks=xxxBASE_URLxxx/feed/rel-xxxSW_VERSIONxxx/kickstart.cfg insturl=xxxBASE_URLxxx/feed/rel-xxxSW_VERSIONxxx/ostree_repo console=ttyS0,115200 console=tty1 biosdevname=0 net.ifnames=0 biosplusefi=1 xxxAPPEND_OPTIONSxxx + KERNEL rel-xxxSW_VERSIONxxx/bzImage-std + APPEND initrd=rel-xxxSW_VERSIONxxx/initrd rdinit=/install defaultkernel=vmlinuz-*[!t]-amd64 traits=controller,worker instname=debian instbr=starlingx instsh=0 instab=0 ks=xxxBASE_URLxxx/feed/rel-xxxSW_VERSIONxxx/kickstart/kickstart.cfg insturl=xxxBASE_URLxxx/feed/rel-xxxSW_VERSIONxxx/ostree_repo console=ttyS0,115200 console=tty1 biosdevname=0 biosplusefi=1 xxxAPPEND_OPTIONSxxx IPAPPEND 2 diff --git a/installer/pxe-network-installer/pxe-network-installer/debian-pxe-smallsystem_lowlatency-install b/installer/pxe-network-installer/pxe-network-installer/debian-pxe-smallsystem_lowlatency-install index 9e0f1781..3fbb9261 100644 --- a/installer/pxe-network-installer/pxe-network-installer/debian-pxe-smallsystem_lowlatency-install +++ b/installer/pxe-network-installer/pxe-network-installer/debian-pxe-smallsystem_lowlatency-install @@ -19,8 +19,8 @@ NOCOMPLETE 1 ALLOWOPTIONS 0 LABEL 1 - MENU LABEL ^1) All-in-one (lowlatency) + MENU LABEL All-in-one (lowlatency) MENU DEFAULT - KERNEL rel-xxxSW_VERSIONxxx/installer-bzImage - APPEND initrd=rel-xxxSW_VERSIONxxx/installer-initrd rdinit=/install traits=controller,worker,lowlatency instname=debian instsh=0 instab=0 instw=10 instbr=starlingx ks=xxxBASE_URLxxx/feed/rel-xxxSW_VERSIONxxx/kickstart.cfg insturl=xxxBASE_URLxxx/feed/rel-xxxSW_VERSIONxxx/ostree_repo console=ttyS0,115200 console=tty1 biosdevname=0 net.ifnames=0 biosplusefi=1 xxxAPPEND_OPTIONSxxx + KERNEL rel-xxxSW_VERSIONxxx/bzImage-rt + APPEND initrd=rel-xxxSW_VERSIONxxx/initrd rdinit=/install defaultkernel=vmlinuz-*-rt-amd64 traits=controller,worker,lowlatency instname=debian instbr=starlingx instsh=0 instab=0 ks=xxxBASE_URLxxx/feed/rel-xxxSW_VERSIONxxx/kickstart/kickstart.cfg insturl=xxxBASE_URLxxx/feed/rel-xxxSW_VERSIONxxx/ostree_repo console=ttyS0,115200 console=tty1 biosdevname=0 biosplusefi=1 xxxAPPEND_OPTIONSxxx IPAPPEND 2 diff --git a/installer/pxe-network-installer/pxe-network-installer/debian-pxe-storage-install b/installer/pxe-network-installer/pxe-network-installer/debian-pxe-storage-install index 439bc7cc..341ee908 100644 --- a/installer/pxe-network-installer/pxe-network-installer/debian-pxe-storage-install +++ b/installer/pxe-network-installer/pxe-network-installer/debian-pxe-storage-install @@ -19,8 +19,8 @@ NOCOMPLETE 1 ALLOWOPTIONS 0 LABEL 1 - MENU LABEL ^1) Storage + MENU LABEL Storage MENU DEFAULT - KERNEL rel-xxxSW_VERSIONxxx/installer-bzImage - APPEND initrd=rel-xxxSW_VERSIONxxx/installer-initrd rdinit=/install traits=storage instname=debian instsh=0 instab=0 instw=10 instbr=starlingx ks=xxxBASE_URLxxx/feed/rel-xxxSW_VERSIONxxx/kickstart.cfg insturl=xxxBASE_URLxxx/feed/rel-xxxSW_VERSIONxxx/ostree_repo console=ttyS0,115200 console=tty1 biosdevname=0 net.ifnames=0 biosplusefi=1 xxxAPPEND_OPTIONSxxx + KERNEL rel-xxxSW_VERSIONxxx/bzImage-std + APPEND initrd=rel-xxxSW_VERSIONxxx/initrd rdinit=/install defaultkernel=vmlinuz-*[!t]-amd64 traits=storage instname=debian instbr=starlingx instsh=0 instab=0 ks=xxxBASE_URLxxx/feed/rel-xxxSW_VERSIONxxx/kickstart/kickstart.cfg insturl=xxxBASE_URLxxx/feed/rel-xxxSW_VERSIONxxx/ostree_repo console=ttyS0,115200 console=tty1 biosdevname=0 biosplusefi=1 xxxAPPEND_OPTIONSxxx IPAPPEND 2 diff --git a/installer/pxe-network-installer/pxe-network-installer/debian-pxe-worker-install b/installer/pxe-network-installer/pxe-network-installer/debian-pxe-worker-install index 88b3faec..aef39a51 100644 --- a/installer/pxe-network-installer/pxe-network-installer/debian-pxe-worker-install +++ b/installer/pxe-network-installer/pxe-network-installer/debian-pxe-worker-install @@ -19,8 +19,8 @@ NOCOMPLETE 1 ALLOWOPTIONS 0 LABEL 1 - MENU LABEL ^1) Worker + MENU LABEL Worker MENU DEFAULT - KERNEL rel-xxxSW_VERSIONxxx/installer-bzImage - APPEND initrd=rel-xxxSW_VERSIONxxx/installer-initrd rdinit=/install traits=worker instname=debian instsh=0 instab=0 instw=10 instbr=starlingx ks=xxxBASE_URLxxx/feed/rel-xxxSW_VERSIONxxx/kickstart.cfg insturl=xxxBASE_URLxxx/feed/rel-xxxSW_VERSIONxxx/ostree_repo console=ttyS0,115200 console=tty1 biosdevname=0 net.ifnames=0 biosplusefi=1 xxxAPPEND_OPTIONSxxx + KERNEL rel-xxxSW_VERSIONxxx/bzImage-std + APPEND initrd=rel-xxxSW_VERSIONxxx/initrd rdinit=/install defaultkernel=vmlinuz-*[!t]-amd64 traits=worker instname=debian instbr=starlingx instsh=0 instab=0 ks=xxxBASE_URLxxx/feed/rel-xxxSW_VERSIONxxx/kickstart/kickstart.cfg insturl=xxxBASE_URLxxx/feed/rel-xxxSW_VERSIONxxx/ostree_repo console=ttyS0,115200 console=tty1 biosdevname=0 biosplusefi=1 xxxAPPEND_OPTIONSxxx IPAPPEND 2 diff --git a/installer/pxe-network-installer/pxe-network-installer/debian-pxe-worker_lowlatency-install b/installer/pxe-network-installer/pxe-network-installer/debian-pxe-worker_lowlatency-install index 3b9c5bd2..f48807ad 100644 --- a/installer/pxe-network-installer/pxe-network-installer/debian-pxe-worker_lowlatency-install +++ b/installer/pxe-network-installer/pxe-network-installer/debian-pxe-worker_lowlatency-install @@ -19,8 +19,8 @@ NOCOMPLETE 1 ALLOWOPTIONS 0 LABEL 1 - MENU LABEL ^1) Lowlatency Worker + MENU LABEL Worker (lowlatency) MENU DEFAULT - KERNEL rel-xxxSW_VERSIONxxx/installer-bzImage - APPEND initrd=rel-xxxSW_VERSIONxxx/installer-initrd rdinit=/install traits=worker,lowlatency instname=debian instsh=0 instab=0 instw=10 instbr=starlingx ks=xxxBASE_URLxxx/feed/rel-xxxSW_VERSIONxxx/kickstart.cfg insturl=xxxBASE_URLxxx/feed/rel-xxxSW_VERSIONxxx/ostree_repo console=ttyS0,115200 console=tty1 biosdevname=0 net.ifnames=0 biosplusefi=1 xxxAPPEND_OPTIONSxxx + KERNEL rel-xxxSW_VERSIONxxx/bzImage-rt + APPEND initrd=rel-xxxSW_VERSIONxxx/initrd rdinit=/install defaultkernel=vmlinuz-*-rt-amd64 traits=worker,lowlatency instname=debian instbr=starlingx instsh=0 instab=0 ks=xxxBASE_URLxxx/feed/rel-xxxSW_VERSIONxxx/kickstart/kickstart.cfg insturl=xxxBASE_URLxxx/feed/rel-xxxSW_VERSIONxxx/ostree_repo console=ttyS0,115200 console=tty1 biosdevname=0 biosplusefi=1 xxxAPPEND_OPTIONSxxx IPAPPEND 2 diff --git a/installer/pxe-network-installer/pxe-network-installer/efi-debian-pxe-controller-install b/installer/pxe-network-installer/pxe-network-installer/efi-debian-pxe-controller-install index 7546e2dd..257daac5 100644 --- a/installer/pxe-network-installer/pxe-network-installer/efi-debian-pxe-controller-install +++ b/installer/pxe-network-installer/pxe-network-installer/efi-debian-pxe-controller-install @@ -3,7 +3,7 @@ timeout=10 GRUB_HIDDEN_TIMEOUT=0 GRUB_TIMEOUT_STYLE='countdown' -menuentry '1) UEFI Standard Controller' { - linuxefi rel-xxxSW_VERSIONxxx/installer-bzImage rdinit=/install traits=controller instname=debian instsh=0 instab=0 instw=10 BOOTIF=$net_default_mac instbr=starlingx ks=xxxBASE_URLxxx/feed/rel-xxxSW_VERSIONxxx/kickstart.cfg insturl=xxxBASE_URLxxx/feed/rel-xxxSW_VERSIONxxx/ostree_repo console=ttyS0,115200 console=tty1 biosdevname=0 net.ifnames=0 biosplusefi=1 xxxAPPEND_OPTIONSxxx - initrdefi rel-xxxSW_VERSIONxxx/installer-initrd +menuentry 'UEFI Standard Controller' { + linux rel-xxxSW_VERSIONxxx/bzImage-std defaultkernel=vmlinuz-*[!t]-amd64 rdinit=/install traits=controller instname=debian instbr=starlingx instsh=0 instab=0 BOOTIF=$net_default_mac ks=xxxBASE_URLxxx/feed/rel-xxxSW_VERSIONxxx/kickstart/kickstart.cfg insturl=xxxBASE_URLxxx/feed/rel-xxxSW_VERSIONxxx/ostree_repo console=ttyS0,115200 console=tty1 biosdevname=0 biosplusefi=1 xxxAPPEND_OPTIONSxxx + initrd rel-xxxSW_VERSIONxxx/initrd } diff --git a/installer/pxe-network-installer/pxe-network-installer/efi-debian-pxe-smallsystem-install b/installer/pxe-network-installer/pxe-network-installer/efi-debian-pxe-smallsystem-install index 99283a99..f3fdeca8 100644 --- a/installer/pxe-network-installer/pxe-network-installer/efi-debian-pxe-smallsystem-install +++ b/installer/pxe-network-installer/pxe-network-installer/efi-debian-pxe-smallsystem-install @@ -3,7 +3,7 @@ timeout=10 GRUB_HIDDEN_TIMEOUT=0 GRUB_TIMEOUT_STYLE='countdown' -menuentry '1) UEFI All-in-one' { - linuxefi rel-xxxSW_VERSIONxxx/installer-bzImage rdinit=/install traits=controller,worker instname=debian instsh=0 instab=0 instw=10 BOOTIF=$net_default_mac instbr=starlingx ks=xxxBASE_URLxxx/feed/rel-xxxSW_VERSIONxxx/kickstart.cfg insturl=xxxBASE_URLxxx/feed/rel-xxxSW_VERSIONxxx/ostree_repo console=ttyS0,115200 console=tty1 biosdevname=0 net.ifnames=0 biosplusefi=1 xxxAPPEND_OPTIONSxxx - initrdefi rel-xxxSW_VERSIONxxx/installer-initrd +menuentry 'UEFI All-in-one' { + linux rel-xxxSW_VERSIONxxx/bzImage-std rdinit=/install defaultkernel=vmlinuz-*[!t]-amd64 traits=controller,worker instname=debian instbr=starlingx instsh=0 instab=0 BOOTIF=$net_default_mac ks=xxxBASE_URLxxx/feed/rel-xxxSW_VERSIONxxx/kickstart/kickstart.cfg insturl=xxxBASE_URLxxx/feed/rel-xxxSW_VERSIONxxx/ostree_repo console=ttyS0,115200 console=tty1 biosdevname=0 biosplusefi=1 xxxAPPEND_OPTIONSxxx + initrd rel-xxxSW_VERSIONxxx/initrd } diff --git a/installer/pxe-network-installer/pxe-network-installer/efi-debian-pxe-smallsystem_lowlatency-install b/installer/pxe-network-installer/pxe-network-installer/efi-debian-pxe-smallsystem_lowlatency-install index ef892f8c..b9211630 100644 --- a/installer/pxe-network-installer/pxe-network-installer/efi-debian-pxe-smallsystem_lowlatency-install +++ b/installer/pxe-network-installer/pxe-network-installer/efi-debian-pxe-smallsystem_lowlatency-install @@ -3,7 +3,7 @@ timeout=10 GRUB_HIDDEN_TIMEOUT=0 GRUB_TIMEOUT_STYLE='countdown' -menuentry '1) UEFI All-in-one (lowlatency)' { - linuxefi rel-xxxSW_VERSIONxxx/installer-bzImage rdinit=/install traits=controller,worker,lowlatency instname=debian instsh=0 instab=0 instw=10 BOOTIF=$net_default_mac instbr=starlingx ks=xxxBASE_URLxxx/feed/rel-xxxSW_VERSIONxxx/kickstart.cfg insturl=xxxBASE_URLxxx/feed/rel-xxxSW_VERSIONxxx/ostree_repo console=ttyS0,115200 console=tty1 biosdevname=0 net.ifnames=0 biosplusefi=1 xxxAPPEND_OPTIONSxxx - initrdefi rel-xxxSW_VERSIONxxx/installer-initrd +menuentry 'UEFI All-in-one (lowlatency)' { + linux rel-xxxSW_VERSIONxxx/bzImage-rt rdinit=/install defaultkernel=vmlinuz-*-rt-amd64 traits=controller,worker,lowlatency instname=debian instbr=starlingx instsh=0 instab=0 BOOTIF=$net_default_mac ks=xxxBASE_URLxxx/feed/rel-xxxSW_VERSIONxxx/kickstart/kickstart.cfg insturl=xxxBASE_URLxxx/feed/rel-xxxSW_VERSIONxxx/ostree_repo console=ttyS0,115200 console=tty1 biosdevname=0 biosplusefi=1 xxxAPPEND_OPTIONSxxx + initrd rel-xxxSW_VERSIONxxx/initrd } diff --git a/installer/pxe-network-installer/pxe-network-installer/efi-debian-pxe-storage-install b/installer/pxe-network-installer/pxe-network-installer/efi-debian-pxe-storage-install index 70621376..6078579d 100644 --- a/installer/pxe-network-installer/pxe-network-installer/efi-debian-pxe-storage-install +++ b/installer/pxe-network-installer/pxe-network-installer/efi-debian-pxe-storage-install @@ -3,7 +3,7 @@ timeout=10 GRUB_HIDDEN_TIMEOUT=0 GRUB_TIMEOUT_STYLE='countdown' -menuentry '1) UEFI Storage' { - linuxefi rel-xxxSW_VERSIONxxx/installer-bzImage rdinit=/install traits=storage instname=debian instsh=0 instab=0 instw=10 BOOTIF=$net_default_mac instbr=starlingx ks=xxxBASE_URLxxx/feed/rel-xxxSW_VERSIONxxx/kickstart.cfg insturl=xxxBASE_URLxxx/feed/rel-xxxSW_VERSIONxxx/ostree_repo console=ttyS0,115200 console=tty1 biosdevname=0 net.ifnames=0 biosplusefi=1 xxxAPPEND_OPTIONSxxx - initrdefi rel-xxxSW_VERSIONxxx/installer-initrd +menuentry 'UEFI Storage' { + linux rel-xxxSW_VERSIONxxx/bzImage-std rdinit=/install defaultkernel=vmlinuz-*[!t]-amd64 traits=storage instname=debian instbr=starlingx instsh=0 instab=0 BOOTIF=$net_default_mac ks=xxxBASE_URLxxx/feed/rel-xxxSW_VERSIONxxx/kickstart/kickstart.cfg insturl=xxxBASE_URLxxx/feed/rel-xxxSW_VERSIONxxx/ostree_repo console=ttyS0,115200 console=tty1 biosdevname=0 biosplusefi=1 xxxAPPEND_OPTIONSxxx + initrd rel-xxxSW_VERSIONxxx/initrd } diff --git a/installer/pxe-network-installer/pxe-network-installer/efi-debian-pxe-worker-install b/installer/pxe-network-installer/pxe-network-installer/efi-debian-pxe-worker-install index 330469c2..a2713736 100644 --- a/installer/pxe-network-installer/pxe-network-installer/efi-debian-pxe-worker-install +++ b/installer/pxe-network-installer/pxe-network-installer/efi-debian-pxe-worker-install @@ -3,7 +3,7 @@ timeout=10 GRUB_HIDDEN_TIMEOUT=0 GRUB_TIMEOUT_STYLE='countdown' -menuentry '1) UEFI Worker' { - linuxefi rel-xxxSW_VERSIONxxx/installer-bzImage rdinit=/install traits=worker instname=debian instsh=0 instab=0 instw=10 BOOTIF=$net_default_mac instbr=starlingx ks=xxxBASE_URLxxx/feed/rel-xxxSW_VERSIONxxx/kickstart.cfg insturl=xxxBASE_URLxxx/feed/rel-xxxSW_VERSIONxxx/ostree_repo console=ttyS0,115200 console=tty1 biosdevname=0 net.ifnames=0 biosplusefi=1 xxxAPPEND_OPTIONSxxx - initrdefi rel-xxxSW_VERSIONxxx/installer-initrd +menuentry 'UEFI Worker' { + linux rel-xxxSW_VERSIONxxx/bzImage-std rdinit=/install defaultkernel=vmlinuz-*[!t]-amd64 traits=worker instname=debian instbr=starlingx instsh=0 instab=0 BOOTIF=$net_default_mac ks=xxxBASE_URLxxx/feed/rel-xxxSW_VERSIONxxx/kickstart/kickstart.cfg insturl=xxxBASE_URLxxx/feed/rel-xxxSW_VERSIONxxx/ostree_repo console=ttyS0,115200 console=tty1 biosdevname=0 biosplusefi=1 xxxAPPEND_OPTIONSxxx + initrd rel-xxxSW_VERSIONxxx/initrd } diff --git a/installer/pxe-network-installer/pxe-network-installer/efi-debian-pxe-worker_lowlatency-install b/installer/pxe-network-installer/pxe-network-installer/efi-debian-pxe-worker_lowlatency-install index f7598ce9..2b211303 100644 --- a/installer/pxe-network-installer/pxe-network-installer/efi-debian-pxe-worker_lowlatency-install +++ b/installer/pxe-network-installer/pxe-network-installer/efi-debian-pxe-worker_lowlatency-install @@ -3,7 +3,7 @@ timeout=10 GRUB_HIDDEN_TIMEOUT=0 GRUB_TIMEOUT_STYLE='countdown' -menuentry '1) UEFI lowlatency Worker' { - linuxefi rel-xxxSW_VERSIONxxx/installer-bzImage rdinit=/install traits=worker,lowlatency instname=debian instsh=0 instab=0 instw=10 BOOTIF=$net_default_mac instbr=starlingx ks=xxxBASE_URLxxx/feed/rel-xxxSW_VERSIONxxx/kickstart.cfg insturl=xxxBASE_URLxxx/feed/rel-xxxSW_VERSIONxxx/ostree_repo console=ttyS0,115200 console=tty1 biosdevname=0 net.ifnames=0 biosplusefi=1 xxxAPPEND_OPTIONSxxx - initrdefi rel-xxxSW_VERSIONxxx/installer-initrd +menuentry 'UEFI Worker (lowlatency)' { + linux rel-xxxSW_VERSIONxxx/bzImage-rt rdinit=/install defaultkernel=vmlinuz-*-rt-amd64 traits=worker,lowlatency instname=debian instbr=starlingx instsh=0 instab=0 BOOTIF=$net_default_mac ks=xxxBASE_URLxxx/feed/rel-xxxSW_VERSIONxxx/kickstart/kickstart.cfg insturl=xxxBASE_URLxxx/feed/rel-xxxSW_VERSIONxxx/ostree_repo console=ttyS0,115200 console=tty1 biosdevname=0 biosplusefi=1 xxxAPPEND_OPTIONSxxx + initrd rel-xxxSW_VERSIONxxx/initrd }