diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2021-11-17 19:53:36 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-11-17 19:53:36 +0100 |
| commit | 55b2efc02891d5aa867950f630b86cbe550e37dd (patch) | |
| tree | 4b8aad3fde98c3b4f29846089bc3ad3cf11f2a3a | |
| parent | 85733e0b4a1d246debcc453f4248cbd9bb91a9d1 (diff) | |
| parent | 3073543fd95d48a59436b0b5def9cce2244417fc (diff) | |
| download | podman-55b2efc02891d5aa867950f630b86cbe550e37dd.tar.gz podman-55b2efc02891d5aa867950f630b86cbe550e37dd.tar.bz2 podman-55b2efc02891d5aa867950f630b86cbe550e37dd.zip | |
Merge pull request #12326 from giuseppe/catatonit-rootless
rootless: use catatonit to maintain user+mnt namespace
| -rw-r--r-- | pkg/rootless/rootless_linux.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/pkg/rootless/rootless_linux.c b/pkg/rootless/rootless_linux.c index 6ce4b1e29..44ed40ce3 100644 --- a/pkg/rootless/rootless_linux.c +++ b/pkg/rootless/rootless_linux.c @@ -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); + 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 (); |