starlingx/metal
Code Issues Proposed changes

Debian: OStree remote not set properly in kickstart for pxeboot installs

Browse Source 
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
This commit is contained in:
Eric MacDonald 2022-06-16 20:57:13 +00:00
parent d92914b9f2
commit bf6f8f0d3e
1 changed files with 7 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
kickstart/files/kickstart.cfg
View File

@ -1983,20 +1983,13 @@ if [ "${controller}" = true -a ${OSTREE_REPO_FETCHED} -eq 0 ] ; then
fi fi
ostree --repo=${repo} pull ${pull_options} ${instbr}:${instbr} ostree --repo=${repo} pull ${pull_options} ${instbr}:${instbr}
# This is used by patching # This is used by patching.
# - change the sysroot remote from NOT_SET to the new feed location # Set ostree remote to the local install feed
if [ "${insturl}" = "file://NOT_SET" ] ; then
file_feed="file:///var/www/pages/feed/rel-${sw_release}/ostree_repo/" file_feed="file:///var/www/pages/feed/rel-${sw_release}/ostree_repo/"
feed_branch="starlingx" feed_branch="starlingx"
ilog "Replacing ostree sysroot remote with: ${file_feed} ${feed_branch}" ilog "Replacing ostree sysroot remote with: ${file_feed} ${feed_branch}"
ostree --repo=/sysroot/ostree/repo remote delete ${instname} ostree --repo=/sysroot/ostree/repo remote delete ${instname}
ostree --repo=/sysroot/ostree/repo remote add ${instname} ${file_feed} ${feed_branch} 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)
# Check for noverifyssl # Check for noverifyssl
if grep -q noverifyssl /proc/cmdline; then if grep -q noverifyssl /proc/cmdline; then