diff options
| author | Giuseppe Scrivano <gscrivan@redhat.com> | 2021-06-09 15:30:41 +0200 |
|---|---|---|
| committer | Giuseppe Scrivano <gscrivan@redhat.com> | 2021-06-10 09:26:06 +0200 |
| commit | d46deca8c8626d879bfe8323af89cdb4edd709dc (patch) | |
| tree | f57c8fb1f53c9de9be711732548952474fd6153d /pkg | |
| parent | a894a3696266c46c56eca50216d687ba58ccfe86 (diff) | |
| download | podman-d46deca8c8626d879bfe8323af89cdb4edd709dc.tar.gz podman-d46deca8c8626d879bfe8323af89cdb4edd709dc.tar.bz2 podman-d46deca8c8626d879bfe8323af89cdb4edd709dc.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>
(cherry picked from commit 11badab046d32c0dce40b28707ee3bb72678e36e)
Diffstat (limited to 'pkg')
| -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 918b9a7e6..8e1785732 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]; |