diff --git a/installer/pxe-network-installer/debian/deb_folder/rules b/installer/pxe-network-installer/debian/deb_folder/rules index d12d6bc8..a5710b20 100644 --- a/installer/pxe-network-installer/debian/deb_folder/rules +++ b/installer/pxe-network-installer/debian/deb_folder/rules @@ -38,16 +38,12 @@ 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 deleted file mode 100644 index 5737bcae..00000000 --- a/installer/pxe-network-installer/pxe-network-installer/debian-pxe-smallsystem_lowlatency-install +++ /dev/null @@ -1,26 +0,0 @@ -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 deleted file mode 100644 index f65ee57e..00000000 --- a/installer/pxe-network-installer/pxe-network-installer/debian-pxe-worker_lowlatency-install +++ /dev/null @@ -1,26 +0,0 @@ -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 deleted file mode 100644 index 5e4ac03a..00000000 --- a/installer/pxe-network-installer/pxe-network-installer/efi-debian-pxe-smallsystem_lowlatency-install +++ /dev/null @@ -1,9 +0,0 @@ -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 deleted file mode 100644 index c9fe8d7a..00000000 --- a/installer/pxe-network-installer/pxe-network-installer/efi-debian-pxe-worker_lowlatency-install +++ /dev/null @@ -1,9 +0,0 @@ -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/efi-pxeboot.cfg.debian b/installer/pxe-network-installer/pxe-network-installer/efi-pxeboot.cfg.debian index 7d466eca..5831a631 100644 --- a/installer/pxe-network-installer/pxe-network-installer/efi-pxeboot.cfg.debian +++ b/installer/pxe-network-installer/pxe-network-installer/efi-pxeboot.cfg.debian @@ -40,14 +40,3 @@ submenu 'UEFI Debian All-in-one Install' --id=aio { initrdefi xxxPXEBOOTxxx/initrd } } - -submenu 'UEFI Debian All-in-one (lowlatency) Install' --id=aio-lowlat { - menuentry 'Serial Console' --id=serial { - linuxefi xxxPXEBOOTxxx/bzImage-rt rdinit=/install defaultkernel=vmlinuz-*-rt-amd64 instname=debian instbr=starlingx instab=0 traits=controller,worker,lowlatency efi=runtime BOOTIF=$net_default_mac instdev=xxxINSTDEVxxx inst_ostree_root=/dev/mapper/cgts--vg-root--lv inst_ostree_var=/dev/mapper/cgts--vg-var--lv ks=xxxBASE_URLxxx/xxxFEEDxxx/kickstart/kickstart.cfg insturl=xxxBASE_URLxxx/xxxFEEDxxx/ostree_repo console=ttyS0,115200 biosdevname=0 biosplusefi=1 - initrdefi xxxPXEBOOTxxx/initrd - } - menuentry 'Graphical Console' --id=graphical { - linuxefi xxxPXEBOOTxxx/bzImage-rt rdinit=/install defaultkernel=vmlinuz-*-rt-amd64 instname=debian instbr=starlingx instab=0 traits=controller,worker,lowlatency efi=runtime BOOTIF=$net_default_mac instdev=xxxINSTDEVxxx inst_ostree_root=/dev/mapper/cgts--vg-root--lv inst_ostree_var=/dev/mapper/cgts--vg-var--lv ks=xxxBASE_URLxxx/xxxFEEDxxx/kickstart/kickstart.cfg insturl=xxxBASE_URLxxx/xxxFEEDxxx/ostree_repo console=tty1 biosdevname=0 biosplusefi=1 - initrdefi xxxPXEBOOTxxx/initrd - } -} diff --git a/installer/pxe-network-installer/pxe-network-installer/pxeboot.cfg.debian b/installer/pxe-network-installer/pxe-network-installer/pxeboot.cfg.debian index 06dfad11..74807892 100644 --- a/installer/pxe-network-installer/pxe-network-installer/pxeboot.cfg.debian +++ b/installer/pxe-network-installer/pxe-network-installer/pxeboot.cfg.debian @@ -47,17 +47,3 @@ menu begin append initrd=xxxPXEBOOTxxx/initrd rdinit=/install defaultkernel=vmlinuz-*[!t]-amd64 instname=debian instbr=starlingx instab=0 traits=controller,worker instdev=xxxINSTDEVxxx inst_ostree_root=/dev/mapper/cgts--vg-root--lv inst_ostree_var=/dev/mapper/cgts--vg-var--lv ks=xxxBASE_URLxxx/xxxFEEDxxx/kickstart/kickstart.cfg insturl=xxxBASE_URLxxx/xxxFEEDxxx/ostree_repo console=tty1 biosdevname=0 biosplusefi=1 ipappend 2 menu end - -menu begin - menu title Debian All-in-one (lowlatency) Install - label 5 - menu label Serial Console - kernel xxxPXEBOOTxxx/bzImage-rt - append initrd=xxxPXEBOOTxxx/initrd rdinit=/install defaultkernel=vmlinuz-*-rt-amd64 instname=debian instbr=starlingx instab=0 traits=controller,worker,lowlatency instdev=xxxINSTDEVxxx inst_ostree_root=/dev/mapper/cgts--vg-root--lv inst_ostree_var=/dev/mapper/cgts--vg-var--lv ks=xxxBASE_URLxxx/xxxFEEDxxx/kickstart/kickstart.cfg insturl=xxxBASE_URLxxx/xxxFEEDxxx/ostree_repo console=ttyS0,115200 biosdevname=0 biosplusefi=1 - ipappend 2 - label 6 - menu label Graphical Console - kernel xxxPXEBOOTxxx/bzImage-rt - append initrd=xxxPXEBOOTxxx/initrd rdinit=/install defaultkernel=vmlinuz-*-rt-amd64 instname=debian instbr=starlingx instab=0 traits=controller,worker,lowlatency instdev=xxxINSTDEVxxx inst_ostree_root=/dev/mapper/cgts--vg-root--lv inst_ostree_var=/dev/mapper/cgts--vg-var--lv ks=xxxBASE_URLxxx/xxxFEEDxxx/kickstart/kickstart.cfg insturl=xxxBASE_URLxxx/xxxFEEDxxx/ostree_repo console=tty1 biosdevname=0 biosplusefi=1 - ipappend 2 -menu end diff --git a/installer/pxe-network-installer/pxe-network-installer/pxeboot_setup.sh b/installer/pxe-network-installer/pxe-network-installer/pxeboot_setup.sh index 173df46a..cc3f2137 100755 --- a/installer/pxe-network-installer/pxe-network-installer/pxeboot_setup.sh +++ b/installer/pxe-network-installer/pxe-network-installer/pxeboot_setup.sh @@ -46,8 +46,7 @@ # # 0 - disk boot # 1 - controller -# 2 - All-in-one (standard) -# 3 - All-in-one (lowlatency) +# 2 - All-in-one # # Refer to usage function for option details. # @@ -87,9 +86,7 @@ UEFI_SYSTEM_TYPES_str=('disk' \ 'standard>serial' \ 'standard>graphical' \ 'aio>serial' \ - 'aio>graphical' \ - 'aio-lowlat>serial' \ - 'aio-lowlat>graphical') + 'aio>graphical') BACKUP=false @@ -122,8 +119,6 @@ function usage { echo " 2 = Controller Install - Graphical Console" echo " 3 = All-in-one Install - Serial Console (default)" echo " 4 = All-in-one Install - Graphical Console" - echo " 5 = All-in-one (lowlatency) Install - Serial Console" - echo " 6 = All-in-one (lowlatency) Install - Graphical Console" echo "" echo "" echo "Example:" @@ -193,7 +188,7 @@ while true; do ;; -s|--system) - if echo "${2}" | grep -q -x '[0-9]\+' && [ ${2} -ge 0 ] && [ ${2} -le 6 ]; then + if echo "${2}" | grep -q -x '[0-9]\+' && [ ${2} -ge 0 ] && [ ${2} -le 4 ]; then SYSTEM=${2} # UEFI: Translate the incoming system type to a string that # specifies the 'default' menu path to be taken. @@ -202,7 +197,7 @@ while true; do # BIOS menu uses the system type number directly. BIOS_SYSTEM="${2}" else - echo "Error: system install type '${2}' is out of range [0..6]" + echo "Error: system install type '${2}' is out of range [0..4]" usage 1 fi shift 2