diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2019-07-22 13:13:50 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-07-22 13:13:50 +0200 |
| commit | 3b52e4d0b5baacf5f63516c664a117a7537a075e (patch) | |
| tree | ef6dc8150136e7941daf45a2e6b615dee43c7893 /pkg/rootless | |
| parent | d6b41eb393c154eaff79b4fdcb04c7510a6fdb20 (diff) | |
| parent | db826d5d75630cca784bd7092eba5b06601ae27f (diff) | |
| download | podman-3b52e4d0b5baacf5f63516c664a117a7537a075e.tar.gz podman-3b52e4d0b5baacf5f63516c664a117a7537a075e.tar.bz2 podman-3b52e4d0b5baacf5f63516c664a117a7537a075e.zip | |
Merge pull request #3562 from baude/golangcilint3
golangci-lint round #3
Diffstat (limited to 'pkg/rootless')
| -rw-r--r-- | pkg/rootless/rootless_linux.go | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/pkg/rootless/rootless_linux.go b/pkg/rootless/rootless_linux.go index 99a0eb729..6e48988c5 100644 --- a/pkg/rootless/rootless_linux.go +++ b/pkg/rootless/rootless_linux.go @@ -111,10 +111,8 @@ func tryMappingTool(tool string, pid int, hostID int, mappings []idtools.IDMap) args := []string{path, fmt.Sprintf("%d", pid)} args = appendTriplet(args, 0, hostID, 1) - if mappings != nil { - for _, i := range mappings { - args = appendTriplet(args, i.ContainerID+1, i.HostID, i.Size) - } + for _, i := range mappings { + args = appendTriplet(args, i.ContainerID+1, i.HostID, i.Size) } cmd := exec.Cmd{ Path: path, @@ -442,7 +440,7 @@ func becomeRootInUserNS(pausePid, fileToRead string, fileOutput *os.File) (bool, return false, -1, errors.Wrapf(err, "write to sync pipe") } - b := make([]byte, 1, 1) + b := make([]byte, 1) _, err = w.Read(b) if err != nil { return false, -1, errors.Wrapf(err, "read from sync pipe") |