diff options
author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2019-05-21 22:08:08 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-05-21 22:08:08 +0200 |
commit | 536fd6adddd9693649457441bd4721c3a774ff0b (patch) | |
tree | e4837741f40bc2a6476d6416bfc5566dcd672061 /pkg/rootless/rootless_unsupported.go | |
parent | 8f43d08d966b9519011cb8ca86e2db9f1f18dfcb (diff) | |
parent | 53a76223ee5bded3be3e0ed957517513ad357a0e (diff) | |
download | podman-536fd6adddd9693649457441bd4721c3a774ff0b.tar.gz podman-536fd6adddd9693649457441bd4721c3a774ff0b.tar.bz2 podman-536fd6adddd9693649457441bd4721c3a774ff0b.zip |
Merge pull request #3084 from giuseppe/rootless-pause-process
rootless: use a pause process to keep namespaces alive
Diffstat (limited to 'pkg/rootless/rootless_unsupported.go')
-rw-r--r-- | pkg/rootless/rootless_unsupported.go | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/pkg/rootless/rootless_unsupported.go b/pkg/rootless/rootless_unsupported.go index 47b5dd7cc..42f8f3aec 100644 --- a/pkg/rootless/rootless_unsupported.go +++ b/pkg/rootless/rootless_unsupported.go @@ -15,7 +15,7 @@ func IsRootless() bool { // into a new user namespace and the return code from the re-executed podman process. // If podman was re-executed the caller needs to propagate the error code returned by the child // process. It is a convenience function for BecomeRootInUserNSWithOpts with a default configuration. -func BecomeRootInUserNS() (bool, int, error) { +func BecomeRootInUserNS(pausePid string) (bool, int, error) { return false, -1, errors.New("this function is not supported on this os") } @@ -28,6 +28,6 @@ func GetRootlessUID() int { // namespace of the specified PID without looking up its parent. Useful to join directly // the conmon process. It is a convenience function for JoinUserAndMountNSWithOpts // with a default configuration. -func JoinUserAndMountNS(pid uint) (bool, int, error) { +func JoinUserAndMountNS(pid uint, pausePid string) (bool, int, error) { return false, -1, errors.New("this function is not supported on this os") } |