Skip to content

Add overrides/rootfs #521

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jlebon merged 1 commit into from
Jun 11, 2019
Merged

Add overrides/rootfs #521

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 11 additions & 1 deletion src/cmdlib.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -239,7 +239,7 @@ runcompose() {
local overridesdir=${workdir}/overrides
local tmp_overridesdir=${TMPDIR}/override
local override_manifest="${tmp_overridesdir}"/coreos-assembler-override-manifest.yaml
if [ -d "${overridesdir}"/rpm ] || [ -n "${ref_is_temp}" ] || [ -d "${configdir}/overlay" ]; then
if [ -d "${overridesdir}" ] || [ -n "${ref_is_temp}" ] || [ -d "${configdir}/overlay" ]; then
mkdir "${tmp_overridesdir}"
cat > "${override_manifest}" <<EOF
include: ${workdir}/src/config/manifest.yaml
Expand Down Expand Up @@ -274,6 +274,16 @@ EOF
name=coreos-assembler-local-overrides
baseurl=file://${workdir}/overrides/rpm
gpgcheck=0
EOF
fi
rootfs_overlay="${overridesdir}/rootfs"
if [ -d "${rootfs_overlay}" ]; then
echo "Committing ${rootfs_overlay}"
sudo ostree commit --repo="${workdir}/tmp/repo" --tree=dir="${rootfs_overlay}" -b cosa-bin-overlay \
--owner-uid 0 --owner-gid 0 --no-xattrs --no-bindings --parent=none
cat >> "${override_manifest}" << EOF
ostree-override-layers:
- cosa-bin-overlay
EOF
fi

Expand Down