Skip to content

Commit

Permalink
runtime: move pause process to scope
Browse files Browse the repository at this point in the history
make sure the pause process is moved to its own scope as well as what
we do when we join an existing user+mount namespace.

Closes: #11560

[NO TESTS NEEDED]

Signed-off-by: Giuseppe Scrivano <[email protected]>
  • Loading branch information
giuseppe committed Sep 16, 2021
1 parent 72534a7 commit a2c8b5d
Showing 1 changed file with 2 additions and 0 deletions.
2 changes: 2 additions & 0 deletions libpod/runtime.go
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@ import (
"github.com/containers/podman/v3/pkg/rootless"
"github.com/containers/podman/v3/pkg/systemd"
"github.com/containers/podman/v3/pkg/util"
"github.com/containers/podman/v3/utils"
"github.com/containers/storage"
"github.com/containers/storage/pkg/unshare"
"github.com/docker/docker/pkg/namesgenerator"
Expand Down Expand Up @@ -543,6 +544,7 @@ func makeRuntime(ctx context.Context, runtime *Runtime) (retErr error) {
return err
}
if became {
utils.MovePauseProcessToScope(pausePid)
os.Exit(ret)
}
}
Expand Down

0 comments on commit a2c8b5d

Please sign in to comment.