summaryrefslogtreecommitdiff
path: root/pkg/rootless
diff options
context:
space:
mode:
authorValentin Rothberg <rothberg@redhat.com>2020-01-08 14:21:35 +0100
committerValentin Rothberg <rothberg@redhat.com>2020-01-08 15:44:30 +0100
commit83764b84ec1aebfae0053a52b67d7f357545b6c9 (patch)
treef5ae151389be62b7314abdfb3ba1ce4206f660c4 /pkg/rootless
parent88369acfca7740abca83d94ac9769d15ecfb3ec0 (diff)
downloadpodman-83764b84ec1aebfae0053a52b67d7f357545b6c9.tar.gz
podman-83764b84ec1aebfae0053a52b67d7f357545b6c9.tar.bz2
podman-83764b84ec1aebfae0053a52b67d7f357545b6c9.zip
fix lint in pkg/rootless
Signed-off-by: Valentin Rothberg <rothberg@redhat.com>
Diffstat (limited to 'pkg/rootless')
-rw-r--r--pkg/rootless/rootless.go3
-rw-r--r--pkg/rootless/rootless_linux.go2
2 files changed, 5 insertions, 0 deletions
diff --git a/pkg/rootless/rootless.go b/pkg/rootless/rootless.go
index 7e9fe9db6..d02721ea9 100644
--- a/pkg/rootless/rootless.go
+++ b/pkg/rootless/rootless.go
@@ -7,6 +7,9 @@ import (
"github.com/pkg/errors"
)
+// TryJoinPauseProcess attempts to join the namespaces of the pause PID via
+// TryJoinFromFilePaths. If joining fails, it attempts to delete the specified
+// file.
func TryJoinPauseProcess(pausePidPath string) (bool, int, error) {
if _, err := os.Stat(pausePidPath); err != nil {
return false, -1, nil
diff --git a/pkg/rootless/rootless_linux.go b/pkg/rootless/rootless_linux.go
index 94c42f7d0..182a39f6b 100644
--- a/pkg/rootless/rootless_linux.go
+++ b/pkg/rootless/rootless_linux.go
@@ -514,6 +514,8 @@ func TryJoinFromFilePaths(pausePidPath string, needNewNamespace bool, paths []st
return joinUserAndMountNS(uint(pausePid), pausePidPath)
}
+
+// ReadMappingsProc parses and returns the ID mappings at the specified path.
func ReadMappingsProc(path string) ([]idtools.IDMap, error) {
file, err := os.Open(path)
if err != nil {