starlingx/metal
Code Issues Proposed changes

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

Browse Source
This commit is contained in:
Zuul 2022-06-16 21:17:35 +00:00 committed by Gerrit Code Review
commit eb46243880
1 changed files with 7 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
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