containers
/
podman
mirror of https://github.com/containers/podman.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix lint in pkg/rootless 

Signed-off-by: Valentin Rothberg <rothberg@redhat.com>
This commit is contained in:
Valentin Rothberg 2020-01-08 14:21:35 +01:00
parent 88369acfca
commit 83764b84ec
2 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
pkg/rootless/rootless.go
View File

@ -7,6 +7,9 @@ import (
"github.com/pkg/errors" "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) { func TryJoinPauseProcess(pausePidPath string) (bool, int, error) {
if _, err := os.Stat(pausePidPath); err != nil { if _, err := os.Stat(pausePidPath); err != nil {
return false, -1, nil return false, -1, nil

2
pkg/rootless/rootless_linux.go
View File

@ -514,6 +514,8 @@ func TryJoinFromFilePaths(pausePidPath string, needNewNamespace bool, paths []st
return joinUserAndMountNS(uint(pausePid), pausePidPath) return joinUserAndMountNS(uint(pausePid), pausePidPath)
} }
// ReadMappingsProc parses and returns the ID mappings at the specified path.
func ReadMappingsProc(path string) ([]idtools.IDMap, error) { func ReadMappingsProc(path string) ([]idtools.IDMap, error) {
file, err := os.Open(path) file, err := os.Open(path)
if err != nil { if err != nil {