From 3ac0bcfd99f94b68fec120db69ec82b24445a3ff Mon Sep 17 00:00:00 2001 From: Eric MacDonald Date: Mon, 4 Apr 2022 13:05:02 +0000 Subject: [PATCH] debian: Fix debian system node grub menu syntax error The debian grub menus were missing a close bracket. Test Plan: PASS: Verify package build and iso create Story: 2009101 Task: 44677 Signed-off-by: Eric MacDonald Change-Id: I1f9a7e3bd0b3a29cf9bfd3aad1d3b7ffe4e38284 --- .../pxe-network-installer/efi-debian-pxe-controller-install | 3 ++- .../pxe-network-installer/efi-debian-pxe-smallsystem-install | 3 ++- .../efi-debian-pxe-smallsystem_lowlatency-install | 3 ++- .../pxe-network-installer/efi-debian-pxe-storage-install | 3 ++- .../pxe-network-installer/efi-debian-pxe-worker-install | 3 ++- .../efi-debian-pxe-worker_lowlatency-install | 3 +-- 6 files changed, 11 insertions(+), 7 deletions(-) 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 4b56ace5..7546e2dd 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 @@ -5,4 +5,5 @@ 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 + initrdefi rel-xxxSW_VERSIONxxx/installer-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 6fc29961..99283a99 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 @@ -5,4 +5,5 @@ 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 + initrdefi rel-xxxSW_VERSIONxxx/installer-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 bd135000..ef892f8c 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 @@ -5,4 +5,5 @@ 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 + initrdefi rel-xxxSW_VERSIONxxx/installer-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 8df043dd..70621376 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 @@ -5,4 +5,5 @@ 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 + initrdefi rel-xxxSW_VERSIONxxx/installer-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 11599a0a..330469c2 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 @@ -5,4 +5,5 @@ 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 + initrdefi rel-xxxSW_VERSIONxxx/installer-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 f70e1f32..f7598ce9 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 @@ -5,6 +5,5 @@ 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 + initrdefi rel-xxxSW_VERSIONxxx/installer-initrd } -