diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2019-01-21 23:32:15 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-01-21 23:32:15 +0100 |
| commit | ed5ac815c20c29ef6724dd07e4be12c8c188beea (patch) | |
| tree | 27ee7f9bf8460ec3f36e5f368de6067b3f58b2dd | |
| parent | ba3509665c16365870ae2c50c6798c0e8489cb78 (diff) | |
| parent | 61216937e7e49a286a6e817f42f6316dfa298c14 (diff) | |
| download | podman-ed5ac815c20c29ef6724dd07e4be12c8c188beea.tar.gz podman-ed5ac815c20c29ef6724dd07e4be12c8c188beea.tar.bz2 podman-ed5ac815c20c29ef6724dd07e4be12c8c188beea.zip | |
Merge pull request #2198 from kirbyfan64/better-refresh-rootless-error
Show a better error message when podman info fails during a refresh
| -rw-r--r-- | libpod/runtime.go | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/libpod/runtime.go b/libpod/runtime.go index 5ff8b30f6..8e7ba8123 100644 --- a/libpod/runtime.go +++ b/libpod/runtime.go @@ -824,7 +824,11 @@ func (r *Runtime) refreshRootless() error { // Take advantage of a command that requires a new userns // so that we are running as the root user and able to use refresh() cmd := exec.Command(os.Args[0], "info") - return cmd.Run() + err := cmd.Run() + if err != nil { + return errors.Wrapf(err, "Error running %s info while refreshing state", os.Args[0]) + } + return nil } // Reconfigures the runtime after a reboot |