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.

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

rootless: use catatonit to maintain user+mnt namespace #12326

Merged
merged 1 commit into from
Nov 17, 2021
Merged

rootless: use catatonit to maintain user+mnt namespace #12326

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
5 changes: 5 additions & 0 deletions pkg/rootless/rootless_linux.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,6 +106,11 @@ do_pause ()
for (i = 0; sig[i]; i++)
sigaction (sig[i], &act, NULL);

/* Attempt to execv catatonit to keep the pause process alive. */
execl ("/usr/libexec/podman/catatonit", "catatonit", "-P", NULL);
Copy link
Member

Choose a reason for hiding this comment

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

Some distributions (e.g., openSUSE) ship it in /usr/bin/catatonit. Could we add another fallback for that?

Copy link
Member Author

Choose a reason for hiding this comment

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

is it fine to assume it has support for -P even when distributed under /usr/bin?

Copy link
Member Author

Choose a reason for hiding this comment

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

amended and pushed a new version

Copy link
Member

Choose a reason for hiding this comment

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

is it fine to assume it has support for -P even when distributed under /usr/bin?

I think so since Podman now requires catatonit >= 0.17.0

execl ("/usr/bin/catatonit", "catatonit", "-P", NULL);
/* and if the catatonit executable could not be found, fallback here... */

prctl (PR_SET_NAME, "podman pause", NULL, NULL, NULL);
while (1)
pause ();
Expand Down