Skip to content

Include more systemd units in the tarball#159

Draft
cyqsimon wants to merge 3 commits into
mgoltzsche:masterfrom
cyqsimon:tar-systemd-units
Draft

Include more systemd units in the tarball#159
cyqsimon wants to merge 3 commits into
mgoltzsche:masterfrom
cyqsimon:tar-systemd-units

Conversation

@cyqsimon

Copy link
Copy Markdown
Contributor

Closes #158.

This PR:

  1. switches to sourcing the systemd unit files from upstream directly, rather than using a vendored copy;
  2. adds netavark-* units.

@mgoltzsche mgoltzsche left a comment

Copy link
Copy Markdown
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks for your contribution @cyqsimon!

I have only one suggestion...

Comment thread Dockerfile Outdated
Comment on lines +91 to +92
RUN make contrib/systemd/system/netavark-{dhcp-proxy,firewalld-reload,nftables-reload}.service; \
rm -f contrib/systemd/system/*.in

@mgoltzsche mgoltzsche Mar 12, 2026

Copy link
Copy Markdown
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Let's make sure that the whole RUN instruction fails when the make call fails:

Suggested change
RUN make contrib/systemd/system/netavark-{dhcp-proxy,firewalld-reload,nftables-reload}.service; \
rm -f contrib/systemd/system/*.in
RUN make contrib/systemd/system/netavark-{dhcp-proxy,firewalld-reload,nftables-reload}.service && \
rm -f contrib/systemd/system/*.in

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Okay seems like we can't use bash-specific expansion syntax here. I believe Alpine's default /bin/sh is ash?

Anyways, let's block this on containers/netavark#1421 for now. That PR should make this easier.

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This PR was merged a while ago, so we're just waiting on the next netavark minor or major release now.

@mgoltzsche Can you please ping me the next time you bump netavark, if you can remember to do so? Thanks.

@mgoltzsche mgoltzsche Jun 16, 2026

Copy link
Copy Markdown
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

fyi: netavark 2.0.0 has been released but, due to breaking changes, it will work with podman 6 only which is not released yet.
Thus, we'll have to wait a bit longer.

@cyqsimon
cyqsimon force-pushed the tar-systemd-units branch from 23421cb to e3910f7 Compare March 13, 2026 04:47
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

Request: include netavark-* systemd units in the tarball release

2 participants