rootless: unexport GetUserNSForPid

Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>

Closes: #1371
Approved by: rhatdan
This commit is contained in:
Giuseppe Scrivano 2018-08-29 10:16:22 +02:00 committed by Atomic Bot
parent 46acded58d
commit 86aefb5de2
2 changed files with 3 additions and 10 deletions

View File

@ -92,7 +92,7 @@ func JoinNS(pid uint) (bool, int, error) {
return false, -1, nil
}
userNS, err := GetUserNSForPid(pid)
userNS, err := getUserNSForPid(pid)
if err != nil {
return false, -1, err
}
@ -238,7 +238,7 @@ func getParentUserNs(fd uintptr) (uintptr, error) {
return (uintptr)(unsafe.Pointer(ret)), nil
}
// GetUserNSForPid returns an open FD for the first direct child user namespace that created the process
// getUserNSForPid returns an open FD for the first direct child user namespace that created the process
// Each container creates a new user namespace where the runtime runs. The current process in the container
// might have created new user namespaces that are child of the initial namespace we created.
// This function finds the initial namespace created for the container that is a child of the current namespace.
@ -250,7 +250,7 @@ func getParentUserNs(fd uintptr) (uintptr, error) {
// b
// /
// NS READ USING THE PID -> c
func GetUserNSForPid(pid uint) (*os.File, error) {
func getUserNSForPid(pid uint) (*os.File, error) {
currentNS, err := readUserNs("/proc/self/ns/user")
if err != nil {
return nil, err

View File

@ -3,8 +3,6 @@
package rootless
import (
"os"
"github.com/pkg/errors"
)
@ -38,8 +36,3 @@ func SkipStorageSetup() bool {
func JoinNS(pid uint) (bool, int, error) {
return false, -1, errors.New("this function is not supported on this os")
}
// GetUserNSForPid returns an open FD for the first direct child user namespace that created the process
func GetUserNSForPid(pid uint) (*os.File, error) {
return nil, errors.New("this function is not supported on this os")
}