rootless: make JoinUserAndMountNS private

as it is used only by the rootless package now.

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

2 files changed, 4 insertions, 12 deletions

diff --git a/pkg/rootless/rootless_linux.go b/pkg/rootless/rootless_linux.go
index 3743911b8..d302b1777 100644
--- a/pkg/rootless/rootless_linux.go
+++ b/pkg/rootless/rootless_linux.go
@@ -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
 // the conmon process.
-func JoinUserAndMountNS(pid uint, pausePid string) (bool, int, error) {
+func joinUserAndMountNS(pid uint, pausePid string) (bool, int, error) {
 	enableLinger(pausePid)
 
 	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 {
 			pid, err := strconv.ParseUint(string(data), 10, 0)
 			if err == nil {
-				return JoinUserAndMountNS(uint(pid), "")
+				return joinUserAndMountNS(uint(pid), "")
 			}
 		}
 		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 JoinUserAndMountNS(uint(pausePid), pausePidPath)
+	return joinUserAndMountNS(uint(pausePid), pausePidPath)
 }
diff --git a/pkg/rootless/rootless_unsupported.go b/pkg/rootless/rootless_unsupported.go
index 06781e6ce..c063adee5 100644
--- a/pkg/rootless/rootless_unsupported.go
+++ b/pkg/rootless/rootless_unsupported.go
@@ -29,14 +29,6 @@ func GetRootlessGID() int {
 	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.
 // 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