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=<vmlinux> 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 <eric.macdonald@windriver.com> Change-Id: Ic3697f4762c2985e599a0955c9785df6c9973db7
This commit is contained in:
Eric MacDonald
parent
f7f552ad8e
commit
4d6255510b
|
|
@ -17,11 +17,6 @@ override_dh_install:
|
||||||
install -v -d -m 755 $(ROOT)/var/pxeboot/rel-${platform_release}
|
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
|
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
|
# Add grub links
|
||||||
install -v -m 644 default $(ROOT)/var/pxeboot/pxelinux.cfg.files/default
|
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
|
install -v -m 644 default.static $(ROOT)/var/pxeboot/pxelinux.cfg.files/default.static
|
||||||
|
|
|
||||||
|
|
@ -19,8 +19,8 @@ NOCOMPLETE 1
|
||||||
ALLOWOPTIONS 0
|
ALLOWOPTIONS 0
|
||||||
|
|
||||||
LABEL 1
|
LABEL 1
|
||||||
MENU LABEL ^1) Standard Controller
|
MENU LABEL Standard Controller
|
||||||
MENU DEFAULT
|
MENU DEFAULT
|
||||||
KERNEL rel-xxxSW_VERSIONxxx/installer-bzImage
|
KERNEL rel-xxxSW_VERSIONxxx/bzImage-std
|
||||||
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
|
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
|
IPAPPEND 2
|
||||||
|
|
|
||||||
|
|
@ -19,8 +19,8 @@ NOCOMPLETE 1
|
||||||
ALLOWOPTIONS 0
|
ALLOWOPTIONS 0
|
||||||
|
|
||||||
LABEL 1
|
LABEL 1
|
||||||
MENU LABEL ^1) All-in-one
|
MENU LABEL All-in-one
|
||||||
MENU DEFAULT
|
MENU DEFAULT
|
||||||
KERNEL rel-xxxSW_VERSIONxxx/installer-bzImage
|
KERNEL rel-xxxSW_VERSIONxxx/bzImage-std
|
||||||
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
|
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
|
IPAPPEND 2
|
||||||
|
|
|
||||||
|
|
@ -19,8 +19,8 @@ NOCOMPLETE 1
|
||||||
ALLOWOPTIONS 0
|
ALLOWOPTIONS 0
|
||||||
|
|
||||||
LABEL 1
|
LABEL 1
|
||||||
MENU LABEL ^1) All-in-one (lowlatency)
|
MENU LABEL All-in-one (lowlatency)
|
||||||
MENU DEFAULT
|
MENU DEFAULT
|
||||||
KERNEL rel-xxxSW_VERSIONxxx/installer-bzImage
|
KERNEL rel-xxxSW_VERSIONxxx/bzImage-rt
|
||||||
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
|
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
|
IPAPPEND 2
|
||||||
|
|
|
||||||
|
|
@ -19,8 +19,8 @@ NOCOMPLETE 1
|
||||||
ALLOWOPTIONS 0
|
ALLOWOPTIONS 0
|
||||||
|
|
||||||
LABEL 1
|
LABEL 1
|
||||||
MENU LABEL ^1) Storage
|
MENU LABEL Storage
|
||||||
MENU DEFAULT
|
MENU DEFAULT
|
||||||
KERNEL rel-xxxSW_VERSIONxxx/installer-bzImage
|
KERNEL rel-xxxSW_VERSIONxxx/bzImage-std
|
||||||
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
|
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
|
IPAPPEND 2
|
||||||
|
|
|
||||||
|
|
@ -19,8 +19,8 @@ NOCOMPLETE 1
|
||||||
ALLOWOPTIONS 0
|
ALLOWOPTIONS 0
|
||||||
|
|
||||||
LABEL 1
|
LABEL 1
|
||||||
MENU LABEL ^1) Worker
|
MENU LABEL Worker
|
||||||
MENU DEFAULT
|
MENU DEFAULT
|
||||||
KERNEL rel-xxxSW_VERSIONxxx/installer-bzImage
|
KERNEL rel-xxxSW_VERSIONxxx/bzImage-std
|
||||||
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
|
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
|
IPAPPEND 2
|
||||||
|
|
|
||||||
|
|
@ -19,8 +19,8 @@ NOCOMPLETE 1
|
||||||
ALLOWOPTIONS 0
|
ALLOWOPTIONS 0
|
||||||
|
|
||||||
LABEL 1
|
LABEL 1
|
||||||
MENU LABEL ^1) Lowlatency Worker
|
MENU LABEL Worker (lowlatency)
|
||||||
MENU DEFAULT
|
MENU DEFAULT
|
||||||
KERNEL rel-xxxSW_VERSIONxxx/installer-bzImage
|
KERNEL rel-xxxSW_VERSIONxxx/bzImage-rt
|
||||||
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
|
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
|
IPAPPEND 2
|
||||||
|
|
|
||||||
|
|
@ -3,7 +3,7 @@ timeout=10
|
||||||
GRUB_HIDDEN_TIMEOUT=0
|
GRUB_HIDDEN_TIMEOUT=0
|
||||||
GRUB_TIMEOUT_STYLE='countdown'
|
GRUB_TIMEOUT_STYLE='countdown'
|
||||||
|
|
||||||
menuentry '1) UEFI Standard Controller' {
|
menuentry '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
|
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
|
||||||
initrdefi rel-xxxSW_VERSIONxxx/installer-initrd
|
initrd rel-xxxSW_VERSIONxxx/initrd
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -3,7 +3,7 @@ timeout=10
|
||||||
GRUB_HIDDEN_TIMEOUT=0
|
GRUB_HIDDEN_TIMEOUT=0
|
||||||
GRUB_TIMEOUT_STYLE='countdown'
|
GRUB_TIMEOUT_STYLE='countdown'
|
||||||
|
|
||||||
menuentry '1) UEFI All-in-one' {
|
menuentry '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
|
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
|
||||||
initrdefi rel-xxxSW_VERSIONxxx/installer-initrd
|
initrd rel-xxxSW_VERSIONxxx/initrd
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -3,7 +3,7 @@ timeout=10
|
||||||
GRUB_HIDDEN_TIMEOUT=0
|
GRUB_HIDDEN_TIMEOUT=0
|
||||||
GRUB_TIMEOUT_STYLE='countdown'
|
GRUB_TIMEOUT_STYLE='countdown'
|
||||||
|
|
||||||
menuentry '1) UEFI All-in-one (lowlatency)' {
|
menuentry '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
|
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
|
||||||
initrdefi rel-xxxSW_VERSIONxxx/installer-initrd
|
initrd rel-xxxSW_VERSIONxxx/initrd
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -3,7 +3,7 @@ timeout=10
|
||||||
GRUB_HIDDEN_TIMEOUT=0
|
GRUB_HIDDEN_TIMEOUT=0
|
||||||
GRUB_TIMEOUT_STYLE='countdown'
|
GRUB_TIMEOUT_STYLE='countdown'
|
||||||
|
|
||||||
menuentry '1) UEFI Storage' {
|
menuentry '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
|
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
|
||||||
initrdefi rel-xxxSW_VERSIONxxx/installer-initrd
|
initrd rel-xxxSW_VERSIONxxx/initrd
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -3,7 +3,7 @@ timeout=10
|
||||||
GRUB_HIDDEN_TIMEOUT=0
|
GRUB_HIDDEN_TIMEOUT=0
|
||||||
GRUB_TIMEOUT_STYLE='countdown'
|
GRUB_TIMEOUT_STYLE='countdown'
|
||||||
|
|
||||||
menuentry '1) UEFI Worker' {
|
menuentry '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
|
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
|
||||||
initrdefi rel-xxxSW_VERSIONxxx/installer-initrd
|
initrd rel-xxxSW_VERSIONxxx/initrd
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -3,7 +3,7 @@ timeout=10
|
||||||
GRUB_HIDDEN_TIMEOUT=0
|
GRUB_HIDDEN_TIMEOUT=0
|
||||||
GRUB_TIMEOUT_STYLE='countdown'
|
GRUB_TIMEOUT_STYLE='countdown'
|
||||||
|
|
||||||
menuentry '1) UEFI lowlatency Worker' {
|
menuentry 'UEFI Worker (lowlatency)' {
|
||||||
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
|
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
|
||||||
initrdefi rel-xxxSW_VERSIONxxx/installer-initrd
|
initrd rel-xxxSW_VERSIONxxx/initrd
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue