From bf6f8f0d3e5ee7279c331132e3f7849aaf478f8d Mon Sep 17 00:00:00 2001
From: Eric MacDonald <eric.macdonald@windriver.com>
Date: Thu, 16 Jun 2022 20:57:13 +0000
Subject: [PATCH] Debian: OStree remote not set properly in kickstart for
 pxeboot installs

This update removes an if condition around setting the OSTree remote
following the pull in the kickstart. This is done so that the ostree
remote is set properly not only for USB but also now PXEBoot installs.

Test Plan:

PASS: Verify the ostree remote path is setup leaving the kickstart for
      both USB and PXEBoot installs.

Closes-Bug: 1979004
Change-Id: I9aab0552bfdb12ac579b351aa5081ab6b4a6ab21
---
 kickstart/files/kickstart.cfg | 21 +++++++--------------
 1 file changed, 7 insertions(+), 14 deletions(-)

diff --git a/kickstart/files/kickstart.cfg b/kickstart/files/kickstart.cfg
index e692efd7..03538301 100644
--- a/kickstart/files/kickstart.cfg
+++ b/kickstart/files/kickstart.cfg
@@ -1983,20 +1983,13 @@ if [ "${controller}" = true -a ${OSTREE_REPO_FETCHED} -eq 0 ] ; then
         fi
         ostree --repo=${repo} pull ${pull_options} ${instbr}:${instbr}
 
-        # This is used by patching
-        # - change the sysroot remote from NOT_SET to the new feed location
-        if [ "${insturl}" = "file://NOT_SET" ] ; then
-            file_feed="file:///var/www/pages/feed/rel-${sw_release}/ostree_repo/"
-            feed_branch="starlingx"
-            ilog "Replacing ostree sysroot remote with: ${file_feed} ${feed_branch}"
-            ostree --repo=/sysroot/ostree/repo remote delete ${instname}
-            ostree --repo=/sysroot/ostree/repo remote add ${instname} ${file_feed} ${feed_branch}
-        fi
-
-        # TODO: Figure out a way on the second run /sysroot/ostree/2
-        #       to avoid this error string
-        #
-        # error: Remote configuration for "starlingx" already exists: (in config)
+        # This is used by patching.
+        # Set ostree remote to the local install feed
+        file_feed="file:///var/www/pages/feed/rel-${sw_release}/ostree_repo/"
+        feed_branch="starlingx"
+        ilog "Replacing ostree sysroot remote with: ${file_feed} ${feed_branch}"
+        ostree --repo=/sysroot/ostree/repo remote delete ${instname}
+        ostree --repo=/sysroot/ostree/repo remote add ${instname} ${file_feed} ${feed_branch}
 
         # Check for noverifyssl
         if grep -q noverifyssl /proc/cmdline; then