diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2019-02-28 12:20:28 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-02-28 12:20:28 -0800 |
| commit | af848ae377f25faf59a9c1bfefb9f7011eb0fe0c (patch) | |
| tree | a85f4d656647ac346f2ce420a70e7d53c2eaf573 /pkg | |
| parent | 4a109a71996e99c9a95b639bbbee1c5e30450c97 (diff) | |
| parent | 23615099e904326ef9e523e0215ac112580db96f (diff) | |
| download | podman-af848ae377f25faf59a9c1bfefb9f7011eb0fe0c.tar.gz podman-af848ae377f25faf59a9c1bfefb9f7011eb0fe0c.tar.bz2 podman-af848ae377f25faf59a9c1bfefb9f7011eb0fe0c.zip | |
Merge pull request #2479 from giuseppe/rootless-give-uidmaptools-error
rootless, new[ug]idmap: on failure add output
Diffstat (limited to 'pkg')
| -rw-r--r-- | pkg/rootless/rootless_linux.go | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/pkg/rootless/rootless_linux.go b/pkg/rootless/rootless_linux.go index 9a192c0fa..98692707f 100644 --- a/pkg/rootless/rootless_linux.go +++ b/pkg/rootless/rootless_linux.go @@ -93,7 +93,8 @@ func tryMappingTool(tool string, pid int, hostID int, mappings []idtools.IDMap) Args: args, } - if err := cmd.Run(); err != nil { + if output, err := cmd.CombinedOutput(); err != nil { + logrus.Debugf("error from %s: %s", tool, output) return errors.Wrapf(err, "cannot setup namespace using %s", tool) } return nil |