opensource/podman
1
0
Fork 0
mirror of https://github.com/containers/podman.git synced 2025-08-06 19:44:14 +08:00
Code Issues Packages Projects Releases Wiki Activity

rootless: make JoinUserAndMountNS private

Browse Source 
as it is used only by the rootless package now.

Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>
This commit is contained in:
Giuseppe Scrivano
2019-05-24 09:41:06 +02:00
parent c4dedd3021
commit 153503e391
2 changed files with 4 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
pkg/rootless/rootless_linux.go
View File

@ -206,10 +206,10 @@ func enableLinger(pausePid string) {
} }
} }
// JoinUserAndMountNS re-exec podman in a new userNS and join the user and mount // joinUserAndMountNS re-exec podman in a new userNS and join the user and mount
// namespace of the specified PID without looking up its parent. Useful to join directly // namespace of the specified PID without looking up its parent. Useful to join directly
// the conmon process. // the conmon process.
func JoinUserAndMountNS(pid uint, pausePid string) (bool, int, error) { func joinUserAndMountNS(pid uint, pausePid string) (bool, int, error) {
enableLinger(pausePid) enableLinger(pausePid)
if os.Geteuid() == 0 || os.Getenv("_CONTAINERS_USERNS_CONFIGURED") != "" { if os.Geteuid() == 0 || os.Getenv("_CONTAINERS_USERNS_CONFIGURED") != "" {
@ -357,7 +357,7 @@ func becomeRootInUserNS(pausePid, fileToRead string, fileOutput *os.File) (bool,
if err == nil { if err == nil {
pid, err := strconv.ParseUint(string(data), 10, 0) pid, err := strconv.ParseUint(string(data), 10, 0)
if err == nil { if err == nil {
return JoinUserAndMountNS(uint(pid), "") return joinUserAndMountNS(uint(pid), "")
} }
} }
return false, -1, errors.Wrapf(err, "error setting up the process") return false, -1, errors.Wrapf(err, "error setting up the process")
@ -480,5 +480,5 @@ func TryJoinFromFilePaths(pausePidPath string, needNewNamespace bool, paths []st
return false, 0, lastErr return false, 0, lastErr
} }
return JoinUserAndMountNS(uint(pausePid), pausePidPath) return joinUserAndMountNS(uint(pausePid), pausePidPath)
} }

8
pkg/rootless/rootless_unsupported.go
View File

@ -29,14 +29,6 @@ func GetRootlessGID() int {
return -1 return -1
} }
// JoinUserAndMountNS re-exec podman in a new userNS and join the user and mount
// 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, pausePid string) (bool, int, error) {
return false, -1, errors.New("this function is not supported on this os")
}
// TryJoinFromFilePaths attempts to join the namespaces of the pid files in paths. // TryJoinFromFilePaths attempts to join the namespaces of the pid files in paths.
// This is useful when there are already running containers and we // This is useful when there are already running containers and we
// don't have a pause process yet. We can use the paths to the conmon // don't have a pause process yet. We can use the paths to the conmon