Skip to content

Commit efb2d8c

Browse files
jbtrystramjlebon
authored andcommitted
cmd-build: Fix env variable name for rpm-ostree extra args
The env variable is pulled in runcompose_tree() form cmdlib.sh : https://github.com/coreos/coreos-assembler/blob/28a26d61315ed596112b35ff69325310e7f9b8e1/src/cmdlib.sh#L556
1 parent 28a26d6 commit efb2d8c

File tree

1 file changed

+4
-4
lines changed

1 file changed

+4
-4
lines changed

src/cmd-build

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ Usage: coreos-assembler build --help
4141
4242
Additional environment variables supported:
4343
44-
RPMOSTREE_EXTRA_ARGS To pass extra arguments to 'rpm-ostree compose tree ...'
44+
COSA_RPMOSTREE_ARGS To pass extra arguments to 'rpm-ostree compose tree ...'
4545
RPMOSTREE_PRESERVE_TMPDIR To keep the temporary compose rootfs from 'rpm-ostree compose tree ...'
4646
4747
EOF
@@ -356,7 +356,7 @@ if [ ! -f "${workdir}"/builds/builds.json ] && [ ! -f "${fetch_stamp}" ] ; then
356356
fi
357357
composefs="$(jq -r .composefs < "${image_json}")"
358358
case "${composefs}" in
359-
false)
359+
false)
360360
;;
361361
true)
362362
ostree config --repo="${tmprepo}" set ex-integrity.composefs "true"
@@ -465,7 +465,7 @@ if [ "${commit}" == "${previous_commit}" ] && \
465465
ostree_tarfile_path=$(jq -r '.images.ostree.path' < "${previous_builddir}/meta.json")
466466
cp-reflink "${previous_builddir}/${previous_ostree_tarfile_path}" "${ostree_tarfile_path}"
467467
ostree_tarfile_sha256=$(jq -r '.images.ostree.sha256' < "${previous_builddir}/meta.json")
468-
468+
469469
ostree_oci_manifest_path="${name}-${buildid}-ostree.${basearch}-manifest.json"
470470
skopeo inspect --raw oci-archive:"${ostree_tarfile_path}" > tmp/manifest.json
471471
/usr/lib/coreos-assembler/finalize-artifact tmp/manifest.json "${ostree_oci_manifest_path}"
@@ -497,7 +497,7 @@ else
497497
"--label=io.openshift.build.versions=machine-os=${buildid}"
498498
)
499499
fi
500-
500+
501501
last_build_manifest=()
502502
if rpm-ostree compose container-encapsulate --help |grep -q -e "--previous-build-manifest"; then
503503
# Use the last stable release if buildfetch used

0 commit comments

Comments
 (0)