diff --git a/installer/pxe-network-installer/debian/deb_folder/rules b/installer/pxe-network-installer/debian/deb_folder/rules index a5710b20..d12d6bc8 100644 --- a/installer/pxe-network-installer/debian/deb_folder/rules +++ b/installer/pxe-network-installer/debian/deb_folder/rules @@ -38,12 +38,16 @@ override_dh_install: install -p -D -m 700 debian-pxe-smallsystem-install $(ROOT)/var/pxeboot/pxelinux.cfg.files/pxe-smallsystem-install-${platform_release} install -p -D -m 700 debian-pxe-storage-install $(ROOT)/var/pxeboot/pxelinux.cfg.files/pxe-storage-install-${platform_release} install -p -D -m 700 debian-pxe-worker-install $(ROOT)/var/pxeboot/pxelinux.cfg.files/pxe-worker-install-${platform_release} + install -p -D -m 700 debian-pxe-worker_lowlatency-install $(ROOT)/var/pxeboot/pxelinux.cfg.files/pxe-worker_lowlatency-install-${platform_release} + install -p -D -m 700 debian-pxe-smallsystem_lowlatency-install $(ROOT)/var/pxeboot/pxelinux.cfg.files/pxe-smallsystem_lowlatency-install-${platform_release} # UEFI System Node Install grub menus install -p -D -m 700 efi-debian-pxe-controller-install $(ROOT)/var/pxeboot/pxelinux.cfg.files/efi-pxe-controller-install-${platform_release} install -p -D -m 700 efi-debian-pxe-smallsystem-install $(ROOT)/var/pxeboot/pxelinux.cfg.files/efi-pxe-smallsystem-install-${platform_release} install -p -D -m 700 efi-debian-pxe-storage-install $(ROOT)/var/pxeboot/pxelinux.cfg.files/efi-pxe-storage-install-${platform_release} install -p -D -m 700 efi-debian-pxe-worker-install $(ROOT)/var/pxeboot/pxelinux.cfg.files/efi-pxe-worker-install-${platform_release} + install -p -D -m 700 efi-debian-pxe-worker_lowlatency-install $(ROOT)/var/pxeboot/pxelinux.cfg.files/efi-pxe-worker_lowlatency-install-${platform_release} + install -p -D -m 700 efi-debian-pxe-smallsystem_lowlatency-install $(ROOT)/var/pxeboot/pxelinux.cfg.files/efi-pxe-smallsystem_lowlatency-install-${platform_release} # Package pxeboot utilities in /var/pxeboot install -d -m 755 $(ROOT)/var/pxeboot 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 new file mode 100644 index 00000000..5737bcae --- /dev/null +++ b/installer/pxe-network-installer/pxe-network-installer/debian-pxe-smallsystem_lowlatency-install @@ -0,0 +1,26 @@ +SERIAL 0 115200 +TIMEOUT 50 +DEFAULT menu.c32 + +# Menu Configuration +MENU WIDTH 80 +MENU MARGIN 10 +MENU PASSWORDMARGIN 3 +MENU ROWS 12 +MENU TABMSGROW 18 +MENU CMDLINEROW 18 +MENU ENDROW 24 +MENU PASSWORDROW 11 +MENU TIMEOUTROW 20 + +PROMPT 0 +NOESCAPE 1 +NOCOMPLETE 1 +ALLOWOPTIONS 0 + +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=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 new file mode 100644 index 00000000..f65ee57e --- /dev/null +++ b/installer/pxe-network-installer/pxe-network-installer/debian-pxe-worker_lowlatency-install @@ -0,0 +1,26 @@ +SERIAL 0 115200 +TIMEOUT 50 +DEFAULT menu.c32 + +# Menu Configuration +MENU WIDTH 80 +MENU MARGIN 10 +MENU PASSWORDMARGIN 3 +MENU ROWS 12 +MENU TABMSGROW 18 +MENU CMDLINEROW 18 +MENU ENDROW 24 +MENU PASSWORDROW 11 +MENU TIMEOUTROW 20 + +PROMPT 0 +NOESCAPE 1 +NOCOMPLETE 1 +ALLOWOPTIONS 0 + +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=tty1 biosdevname=0 biosplusefi=1 xxxAPPEND_OPTIONSxxx + IPAPPEND 2 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 new file mode 100644 index 00000000..5e4ac03a --- /dev/null +++ b/installer/pxe-network-installer/pxe-network-installer/efi-debian-pxe-smallsystem_lowlatency-install @@ -0,0 +1,9 @@ +default=0 +timeout=10 +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=tty1 biosdevname=0 biosplusefi=1 efi=runtime 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 new file mode 100644 index 00000000..c9fe8d7a --- /dev/null +++ b/installer/pxe-network-installer/pxe-network-installer/efi-debian-pxe-worker_lowlatency-install @@ -0,0 +1,9 @@ +default=0 +timeout=10 +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=tty1 biosdevname=0 biosplusefi=1 efi=runtime xxxAPPEND_OPTIONSxxx + initrd rel-xxxSW_VERSIONxxx/initrd +} diff --git a/installer/pxe-network-installer/pxe-network-installer/pxeboot-update.sh b/installer/pxe-network-installer/pxe-network-installer/pxeboot-update.sh index 09474f83..045e949d 100755 --- a/installer/pxe-network-installer/pxe-network-installer/pxeboot-update.sh +++ b/installer/pxe-network-installer/pxe-network-installer/pxeboot-update.sh @@ -77,12 +77,7 @@ do case $opt in i) input_file=$OPTARG - input_file_dirname=$(dirname $input_file) - input_file_basename=$(basename $input_file) - # lowlatency files removed. Added for backwards compatibility - fixed_input_file_basename=$(echo $input_file_basename | sed 's/_lowlatency//') - input_file=${input_file_dirname}/${fixed_input_file_basename} - input_file_efi=${input_file_dirname}/efi-${fixed_input_file_basename} + input_file_efi=$(dirname $input_file)/efi-$(basename $input_file) ;; o) output_file=$OPTARG