Skip to content
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.

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

catatoinit: rewrite LISTEN_PID to the child process #15

Merged
merged 1 commit into from
Sep 15, 2021

Conversation

giuseppe
Copy link
Contributor

@giuseppe giuseppe commented Sep 2, 2021

In order to get systemd fd passing let's rewrite the LISTEN_PID
environment variable if it is pointing to catatonit init process.

Closes: #13

Signed-off-by: Giuseppe Scrivano gscrivan@redhat.com

@alexlarsson
Copy link

Didn't test it, but lgtm

Copy link
Member

@cyphar cyphar left a comment

Choose a reason for hiding this comment

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

As with the other PR, I didn't see this until now. Sorry about that.

catatonit.c Outdated Show resolved Hide resolved
catatonit.c Outdated Show resolved Hide resolved
catatonit.c Outdated Show resolved Hide resolved
In order to get systemd fd passing let's rewrite the LISTEN_PID
environment variable if it is pointing to catatonit init process.

Closes: openSUSE#13

Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
@giuseppe
Copy link
Contributor Author

thanks for the review. I've addressed your comments in the last commit

Copy link
Member

@cyphar cyphar left a comment

Choose a reason for hiding this comment

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

LGTM.

@cyphar cyphar merged commit a1aba29 into openSUSE:master Sep 15, 2021
@cyphar
Copy link
Member

cyphar commented Sep 15, 2021

I'll do a new release once #14 is merged.

alexlarsson added a commit to alexlarsson/podman that referenced this pull request Oct 25, 2022
This was added in the old quadlet to work around issues with podman
not passing on notify fds and pids. However, these are now fixed with:

containers#11316
openSUSE/catatonit#15

So, remove this key (which was never in a podman release anyway)

Signed-off-by: Alexander Larsson <alexl@redhat.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Should catatonit rewrite LISTEN_PID?
3 participants