From 01244413a6bc2dbf866e0f439604d4eb484999a4 Mon Sep 17 00:00:00 2001
From: Eric MacDonald <eric.macdonald@windriver.com>
Date: Mon, 12 Sep 2022 12:38:30 +0000
Subject: [PATCH] Debian KS: Adds starlingx to ostree branches for
 non-controller nodes

The current kickstart is not adding starlingx to the ostree remote
branches for worker and storage nodes (non-controller) nodes.

This update catches this case and adds the starlingx branch
to the ostree remote setup.

With this update: /ostree/repo/config

  [remote "debian"]
  url=http://pxecontroller:8080/feed/rel-??.??/ostree_repo
  branches=starlingx;

Test Plan:

PASS: Verify standard system install
PASS: Verify All-in-one system install
PASS: Verify change on both worker and storage node installs

Story: 2009968
Task: 46260
Change-Id: Idc06877e15c412b4f561a9364cf7f0874ab9f9fc
---
 kickstart/files/kickstart.cfg | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/kickstart/files/kickstart.cfg b/kickstart/files/kickstart.cfg
index 5b33aafb..bfc061ca 100644
--- a/kickstart/files/kickstart.cfg
+++ b/kickstart/files/kickstart.cfg
@@ -2339,7 +2339,15 @@ if [ "${controller}" = true ] ; then
         ln -s ../../pxelinux.cfg/grub.cfg
     fi
     popd > /dev/null
-
+else
+    # This is used by patching.
+    # For non-controller system node installs (worker/storage) we need to
+    # update the ostree remote to be the url to the pxecontroller's ostree_repo
+    # and set the remote debian branches to starlingx.
+    feed_branch="starlingx"
+    ilog "Replacing ostree sysroot remote with: ${feed_branch}"
+    ostree --repo=/sysroot/ostree/repo remote delete ${instname}
+    ostree --repo=/sysroot/ostree/repo remote add ${instname} ${insturl} ${feed_branch}
 fi
 
 # Save the install scripts and kickstart logs