From a8b81bd3fccd23e0ab476e5f15a0d8b8475ffd7f Mon Sep 17 00:00:00 2001
From: Eric MacDonald <eric.macdonald@windriver.com>
Date: Wed, 23 Nov 2022 21:31:43 +0000
Subject: [PATCH] Make Debian USB install default to Controller Install

This update changes the default USB install from
All-In-One to Controller Install to line up with
what was offered in CentOS.

Test Plan:

PASS: Verify timeout default path is Controller Install
PASS: Verify default menu select is Controller Install
PASS: Verify above to be true for both BIOS and UEFI

Regression:

PASS: Verify Debian Build and AIO install
PASS: Verify default select install ; Controller install
PASS: Verify default select override install ; AIO Low Latency
PASS: Verify default select override install ; AIO
PASS: verify both Graphical and Serial Console cases

Story: 2009968
Task: 46931
Signed-off-by: Eric MacDonald <eric.macdonald@windriver.com>
Change-Id: I08844661ce8df410bb41c054146dfc68f7297736
---
 .../config/debian/common/base-bullseye.yaml   | 19 +++----------------
 1 file changed, 3 insertions(+), 16 deletions(-)

diff --git a/debian-mirror-tools/config/debian/common/base-bullseye.yaml b/debian-mirror-tools/config/debian/common/base-bullseye.yaml
index f80a4d12..f0fff480 100644
--- a/debian-mirror-tools/config/debian/common/base-bullseye.yaml
+++ b/debian-mirror-tools/config/debian/common/base-bullseye.yaml
@@ -152,10 +152,11 @@ iso-grub-entry: |
 
 iso-syslinux-entry: |
   menu start
-  ontimeout LABEL
+  ontimeout 1
 
   menu begin
     menu title Debian Controller Install
+    menu default
 
     label 1
       menu label Serial Console
@@ -172,7 +173,6 @@ iso-syslinux-entry: |
 
   menu begin
     menu title Debian All-in-one Install
-    menu DEFAULT-STD
 
     label 3
       menu label Serial Console
@@ -189,7 +189,6 @@ iso-syslinux-entry: |
 
   menu begin
     menu title Debian All-in-one (lowlatency) Install
-    menu DEFAULT-RT
 
     label 5
       menu label Serial Console
@@ -353,22 +352,10 @@ iso-post-script: |
     # Boot rt kernel by default
     sed -i "s/ set default=.*/ set default=2/g" \
       EFI/BOOT/grub.cfg
-    sed -i "s/menu DEFAULT-STD//g" \
-      isolinux/isolinux.cfg
-    sed -i "s/menu DEFAULT-RT/menu default/g" \
-      isolinux/isolinux.cfg
-    sed -i "s/ontimeout LABEL/ontimeout 5/g" \
-      isolinux/isolinux.cfg
   else
     # Boot std kernel by default
-    sed -i "s/ set default=.*/ set default=1/g" \
+    sed -i "s/ set default=.*/ set default=0/g" \
       EFI/BOOT/grub.cfg
-    sed -i "s/menu DEFAULT-STD/menu default/g" \
-      isolinux/isolinux.cfg
-    sed -i "s/menu DEFAULT-RT//g" \
-      isolinux/isolinux.cfg
-    sed -i "s/ontimeout LABEL/ontimeout 3/g" \
-      isolinux/isolinux.cfg
   fi
 
   # 3.2 Resign grub.cfg if EFI secure boot enabled