diff options
| author | Giuseppe Scrivano <gscrivan@redhat.com> | 2021-06-09 15:30:41 +0200 |
|---|---|---|
| committer | Giuseppe Scrivano <gscrivan@redhat.com> | 2021-06-09 15:30:41 +0200 |
| commit | 11badab046d32c0dce40b28707ee3bb72678e36e (patch) | |
| tree | 2b63a14c914222571372e26c2c5787f862144488 | |
| parent | 2970e3518cc95910444903f572418f5887316e47 (diff) | |
| download | podman-11badab046d32c0dce40b28707ee3bb72678e36e.tar.gz podman-11badab046d32c0dce40b28707ee3bb72678e36e.tar.bz2 podman-11badab046d32c0dce40b28707ee3bb72678e36e.zip | |
rootless: fix fast join userns path
commit ab886328357184cd0a8375a5dedf816ba91789f9 changed the path for
the pause.pid file but didn't update the same path in the C code.
This prevented Podman to take the fast path when the userns is already
created and to join it without re-execing itself.
Fix the path in the C code as well so we can join the rootless
user+mount namespace without having to re-exec Podman.
[NO TESTS NEEDED]
Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
| -rw-r--r-- | pkg/rootless/rootless_linux.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/pkg/rootless/rootless_linux.c b/pkg/rootless/rootless_linux.c index 0d1d6e93e..e5f9e88d9 100644 --- a/pkg/rootless/rootless_linux.c +++ b/pkg/rootless/rootless_linux.c @@ -333,7 +333,7 @@ static void __attribute__((constructor)) init() uid_t uid; gid_t gid; char path[PATH_MAX]; - const char *const suffix = "/libpod/pause.pid"; + const char *const suffix = "/libpod/tmp/pause.pid"; char *cwd = getcwd (NULL, 0); char uid_fmt[16]; char gid_fmt[16]; |