starlingx/metal
Code Issues Proposed changes

Remove console=ttyS0,115200 from system node install menus

Browse Source 
This update removes the 'console=ttyS0,115200' grub command
line arguement from the debian system node install menus.

Then allow system inventory to add a customer specified
console setting at node provisioning time by way of
xxxAPPEND_OPTIONSxxx variable replacement.

Test Plan:

PASS: Verify all system node install grub menus get 'ttySx*'
      value from system inventory. (dm config)
PASS: Verify all system node install grub menus default
      to "ttyS0,115200" if missing for a node's provisioning
      in system inventory. (vbox config)

Partial Bug: 2000093
Depends-On: https://review.opendev.org/c/starlingx/config/+/868353

Signed-off-by: Eric MacDonald <eric.macdonald@windriver.com>
Change-Id: I866f29233d2f2e637725a98b445ac6d24333ea30
This commit is contained in:
Eric MacDonald 2022-12-21 10:54:31 -05:00
parent af7defe48f
commit 3fee973f9e
12 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
installer/pxe-network-installer/pxe-network-installer/debian-pxe-controller-install
View File

@ -22,5 +22,5 @@ LABEL 1
MENU LABEL Standard Controller
MENU DEFAULT
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 inst_ostree_root=/dev/mapper/cgts--vg-root--lv inst_ostree_var=/dev/mapper/cgts--vg-var--lv 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
APPEND initrd=rel-xxxSW_VERSIONxxx/initrd rdinit=/install defaultkernel=vmlinuz-*[!t]-amd64 traits=controller instname=debian instbr=starlingx instsh=0 instab=0 inst_ostree_root=/dev/mapper/cgts--vg-root--lv inst_ostree_var=/dev/mapper/cgts--vg-var--lv ks=xxxBASE_URLxxx/feed/rel-xxxSW_VERSIONxxx/kickstart/kickstart.cfg insturl=xxxBASE_URLxxx/feed/rel-xxxSW_VERSIONxxx/ostree_repo console=tty1 biosdevname=0 biosplusefi=1 xxxAPPEND_OPTIONSxxx
IPAPPEND 2

2
installer/pxe-network-installer/pxe-network-installer/debian-pxe-smallsystem-install
View File

@ -22,5 +22,5 @@ LABEL 1
MENU LABEL All-in-one
MENU DEFAULT
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 inst_ostree_root=/dev/mapper/cgts--vg-root--lv inst_ostree_var=/dev/mapper/cgts--vg-var--lv 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
APPEND initrd=rel-xxxSW_VERSIONxxx/initrd rdinit=/install defaultkernel=vmlinuz-*[!t]-amd64 traits=controller,worker instname=debian instbr=starlingx instsh=0 instab=0 inst_ostree_root=/dev/mapper/cgts--vg-root--lv inst_ostree_var=/dev/mapper/cgts--vg-var--lv ks=xxxBASE_URLxxx/feed/rel-xxxSW_VERSIONxxx/kickstart/kickstart.cfg insturl=xxxBASE_URLxxx/feed/rel-xxxSW_VERSIONxxx/ostree_repo console=tty1 biosdevname=0 biosplusefi=1 xxxAPPEND_OPTIONSxxx
IPAPPEND 2

2
installer/pxe-network-installer/pxe-network-installer/debian-pxe-smallsystem_lowlatency-install
View File

@ -22,5 +22,5 @@ LABEL 1
MENU LABEL All-in-one (lowlatency)
MENU DEFAULT
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 inst_ostree_root=/dev/mapper/cgts--vg-root--lv inst_ostree_var=/dev/mapper/cgts--vg-var--lv 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
APPEND initrd=rel-xxxSW_VERSIONxxx/initrd rdinit=/install defaultkernel=vmlinuz-*-rt-amd64 traits=controller,worker,lowlatency instname=debian instbr=starlingx instsh=0 instab=0 inst_ostree_root=/dev/mapper/cgts--vg-root--lv inst_ostree_var=/dev/mapper/cgts--vg-var--lv ks=xxxBASE_URLxxx/feed/rel-xxxSW_VERSIONxxx/kickstart/kickstart.cfg insturl=xxxBASE_URLxxx/feed/rel-xxxSW_VERSIONxxx/ostree_repo console=tty1 biosdevname=0 biosplusefi=1 xxxAPPEND_OPTIONSxxx
IPAPPEND 2

2
installer/pxe-network-installer/pxe-network-installer/debian-pxe-storage-install
View File

@ -22,5 +22,5 @@ LABEL 1
MENU LABEL Storage
MENU DEFAULT
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 inst_ostree_root=/dev/mapper/cgts--vg-root--lv inst_ostree_var=/dev/mapper/cgts--vg-var--lv 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
APPEND initrd=rel-xxxSW_VERSIONxxx/initrd rdinit=/install defaultkernel=vmlinuz-*[!t]-amd64 traits=storage instname=debian instbr=starlingx instsh=0 instab=0 inst_ostree_root=/dev/mapper/cgts--vg-root--lv inst_ostree_var=/dev/mapper/cgts--vg-var--lv ks=xxxBASE_URLxxx/feed/rel-xxxSW_VERSIONxxx/kickstart/kickstart.cfg insturl=xxxBASE_URLxxx/feed/rel-xxxSW_VERSIONxxx/ostree_repo console=tty1 biosdevname=0 biosplusefi=1 xxxAPPEND_OPTIONSxxx
IPAPPEND 2

2
installer/pxe-network-installer/pxe-network-installer/debian-pxe-worker-install
View File

@ -22,5 +22,5 @@ LABEL 1
MENU LABEL Worker
MENU DEFAULT
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 inst_ostree_root=/dev/mapper/cgts--vg-root--lv inst_ostree_var=/dev/mapper/cgts--vg-var--lv 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
APPEND initrd=rel-xxxSW_VERSIONxxx/initrd rdinit=/install defaultkernel=vmlinuz-*[!t]-amd64 traits=worker instname=debian instbr=starlingx instsh=0 instab=0 inst_ostree_root=/dev/mapper/cgts--vg-root--lv inst_ostree_var=/dev/mapper/cgts--vg-var--lv ks=xxxBASE_URLxxx/feed/rel-xxxSW_VERSIONxxx/kickstart/kickstart.cfg insturl=xxxBASE_URLxxx/feed/rel-xxxSW_VERSIONxxx/ostree_repo console=tty1 biosdevname=0 biosplusefi=1 xxxAPPEND_OPTIONSxxx
IPAPPEND 2

2
installer/pxe-network-installer/pxe-network-installer/debian-pxe-worker_lowlatency-install
View File

@ -22,5 +22,5 @@ LABEL 1
MENU LABEL Worker (lowlatency)
MENU DEFAULT
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 inst_ostree_root=/dev/mapper/cgts--vg-root--lv inst_ostree_var=/dev/mapper/cgts--vg-var--lv 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
APPEND initrd=rel-xxxSW_VERSIONxxx/initrd rdinit=/install defaultkernel=vmlinuz-*-rt-amd64 traits=worker,lowlatency instname=debian instbr=starlingx instsh=0 instab=0 inst_ostree_root=/dev/mapper/cgts--vg-root--lv inst_ostree_var=/dev/mapper/cgts--vg-var--lv ks=xxxBASE_URLxxx/feed/rel-xxxSW_VERSIONxxx/kickstart/kickstart.cfg insturl=xxxBASE_URLxxx/feed/rel-xxxSW_VERSIONxxx/ostree_repo console=tty1 biosdevname=0 biosplusefi=1 xxxAPPEND_OPTIONSxxx
IPAPPEND 2

2
installer/pxe-network-installer/pxe-network-installer/efi-debian-pxe-controller-install
View File

@ -4,6 +4,6 @@ GRUB_HIDDEN_TIMEOUT=0
GRUB_TIMEOUT_STYLE='countdown'
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 inst_ostree_root=/dev/mapper/cgts--vg-root--lv inst_ostree_var=/dev/mapper/cgts--vg-var--lv 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
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 inst_ostree_root=/dev/mapper/cgts--vg-root--lv inst_ostree_var=/dev/mapper/cgts--vg-var--lv ks=xxxBASE_URLxxx/feed/rel-xxxSW_VERSIONxxx/kickstart/kickstart.cfg insturl=xxxBASE_URLxxx/feed/rel-xxxSW_VERSIONxxx/ostree_repo console=tty1 biosdevname=0 biosplusefi=1 xxxAPPEND_OPTIONSxxx
initrd rel-xxxSW_VERSIONxxx/initrd
}

2
installer/pxe-network-installer/pxe-network-installer/efi-debian-pxe-smallsystem-install
View File

@ -4,6 +4,6 @@ GRUB_HIDDEN_TIMEOUT=0
GRUB_TIMEOUT_STYLE='countdown'
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 inst_ostree_root=/dev/mapper/cgts--vg-root--lv inst_ostree_var=/dev/mapper/cgts--vg-var--lv 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
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 inst_ostree_root=/dev/mapper/cgts--vg-root--lv inst_ostree_var=/dev/mapper/cgts--vg-var--lv ks=xxxBASE_URLxxx/feed/rel-xxxSW_VERSIONxxx/kickstart/kickstart.cfg insturl=xxxBASE_URLxxx/feed/rel-xxxSW_VERSIONxxx/ostree_repo console=tty1 biosdevname=0 biosplusefi=1 xxxAPPEND_OPTIONSxxx
initrd rel-xxxSW_VERSIONxxx/initrd
}

2
installer/pxe-network-installer/pxe-network-installer/efi-debian-pxe-smallsystem_lowlatency-install
View File

@ -4,6 +4,6 @@ GRUB_HIDDEN_TIMEOUT=0
GRUB_TIMEOUT_STYLE='countdown'
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 inst_ostree_root=/dev/mapper/cgts--vg-root--lv inst_ostree_var=/dev/mapper/cgts--vg-var--lv 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 efi=runtime xxxAPPEND_OPTIONSxxx
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 inst_ostree_root=/dev/mapper/cgts--vg-root--lv inst_ostree_var=/dev/mapper/cgts--vg-var--lv ks=xxxBASE_URLxxx/feed/rel-xxxSW_VERSIONxxx/kickstart/kickstart.cfg insturl=xxxBASE_URLxxx/feed/rel-xxxSW_VERSIONxxx/ostree_repo console=tty1 biosdevname=0 biosplusefi=1 efi=runtime xxxAPPEND_OPTIONSxxx
initrd rel-xxxSW_VERSIONxxx/initrd
}

2
installer/pxe-network-installer/pxe-network-installer/efi-debian-pxe-storage-install
View File

@ -4,6 +4,6 @@ GRUB_HIDDEN_TIMEOUT=0
GRUB_TIMEOUT_STYLE='countdown'
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 inst_ostree_root=/dev/mapper/cgts--vg-root--lv inst_ostree_var=/dev/mapper/cgts--vg-var--lv 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
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 inst_ostree_root=/dev/mapper/cgts--vg-root--lv inst_ostree_var=/dev/mapper/cgts--vg-var--lv ks=xxxBASE_URLxxx/feed/rel-xxxSW_VERSIONxxx/kickstart/kickstart.cfg insturl=xxxBASE_URLxxx/feed/rel-xxxSW_VERSIONxxx/ostree_repo console=tty1 biosdevname=0 biosplusefi=1 xxxAPPEND_OPTIONSxxx
initrd rel-xxxSW_VERSIONxxx/initrd
}

2
installer/pxe-network-installer/pxe-network-installer/efi-debian-pxe-worker-install
View File

@ -4,6 +4,6 @@ GRUB_HIDDEN_TIMEOUT=0
GRUB_TIMEOUT_STYLE='countdown'
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 inst_ostree_root=/dev/mapper/cgts--vg-root--lv inst_ostree_var=/dev/mapper/cgts--vg-var--lv 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
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 inst_ostree_root=/dev/mapper/cgts--vg-root--lv inst_ostree_var=/dev/mapper/cgts--vg-var--lv ks=xxxBASE_URLxxx/feed/rel-xxxSW_VERSIONxxx/kickstart/kickstart.cfg insturl=xxxBASE_URLxxx/feed/rel-xxxSW_VERSIONxxx/ostree_repo console=tty1 biosdevname=0 biosplusefi=1 xxxAPPEND_OPTIONSxxx
initrd rel-xxxSW_VERSIONxxx/initrd
}

2
installer/pxe-network-installer/pxe-network-installer/efi-debian-pxe-worker_lowlatency-install
View File

@ -4,6 +4,6 @@ GRUB_HIDDEN_TIMEOUT=0
GRUB_TIMEOUT_STYLE='countdown'
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 inst_ostree_root=/dev/mapper/cgts--vg-root--lv inst_ostree_var=/dev/mapper/cgts--vg-var--lv 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 efi=runtime xxxAPPEND_OPTIONSxxx
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 inst_ostree_root=/dev/mapper/cgts--vg-root--lv inst_ostree_var=/dev/mapper/cgts--vg-var--lv ks=xxxBASE_URLxxx/feed/rel-xxxSW_VERSIONxxx/kickstart/kickstart.cfg insturl=xxxBASE_URLxxx/feed/rel-xxxSW_VERSIONxxx/ostree_repo console=tty1 biosdevname=0 biosplusefi=1 efi=runtime xxxAPPEND_OPTIONSxxx
initrd rel-xxxSW_VERSIONxxx/initrd
}