Merge pull request #2588 from giuseppe/rootless-propagate-error-from-info

rootless: propagate errors from info

1 files changed, 6 insertions, 3 deletions

diff --git a/libpod/runtime.go b/libpod/runtime.go
index 482cd9d73..9667abfe6 100644
--- a/libpod/runtime.go
+++ b/libpod/runtime.go
@@ -971,9 +971,12 @@ 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")
-	err := cmd.Run()
-	if err != nil {
-		return errors.Wrapf(err, "Error running %s info while refreshing state", os.Args[0])
+
+	if output, err := cmd.CombinedOutput(); err != nil {
+		if _, ok := err.(*exec.ExitError); !ok {
+			return errors.Wrapf(err, "Error waiting for info while refreshing state: %s", os.Args[0])
+		}
+		return errors.Wrapf(err, "Error running %s info while refreshing state: %s", os.Args[0], output)
 	}
 	return nil
 }