Include more systemd units in the tarball - follow-up to #159 - #172
Open
tobwen wants to merge 4 commits into
Open
Include more systemd units in the tarball - follow-up to #159#172tobwen wants to merge 4 commits into
tobwen wants to merge 4 commits into
Conversation
Set `LIBEXECPODMAN` so the generated units point to the netavark binary location used by this image, and copy the installed units from `/systemd` instead of the build directory to avoid shipping `.service.in` templates.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Summary
Follow-up to #159: same content, rebased onto the current master, with two fixes to the netavark unit installation.
Details
Like #159, this sources the systemd unit files from upstream instead of the vendored copies in
conf/systemd/, and adds thenetavark-*units to the tarball. On top of that it fixes two issues I found in #159:@@NETAVARK@@with$(LIBEXECPODMAN)/netavark. netavark v2.1.0 defaultsLIBEXECPODMANto/usr/local/libexec/podman, but this image ships the netavark binary at/usr/local/lib/podman/netavark- so all three netavark units referenced a non-existent path. Fixed by passingLIBEXECPODMAN=/usr/local/lib/podmantomake install.systemd.contrib/systemd/systembuild directory, which also ships the.service.intemplates in the tarball. Fixed by copying the installed units from/systemdinstead.Verified by building the
tar-archivetarget/usr/local/lib/systemd/systemcontains all unit files with correctExecStartpaths (/usr/local/lib/podman/netavark,/usr/local/bin/podman),.service.infiles.