From bee8cb5fbb6c35bfc228adb1249bd1ce8466ef9c Mon Sep 17 00:00:00 2001
From: Michael Crosby <crosbymichael@gmail.com>
Date: Fri, 8 Apr 2016 11:02:44 -0700
Subject: [PATCH] Report hook output on error

Fixes #733

This reports the stdout/err for a hook if it returns a non-zero exit
status.

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
---
 libcontainer/configs/config.go | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/libcontainer/configs/config.go b/libcontainer/configs/config.go
index f83f638e3..0354dbd5e 100644
--- a/libcontainer/configs/config.go
+++ b/libcontainer/configs/config.go
@@ -307,7 +307,11 @@ func (c Command) Run(s HookState) error {
 	}
 	errC := make(chan error, 1)
 	go func() {
-		errC <- cmd.Run()
+		out, err := cmd.CombinedOutput()
+		if err != nil {
+			err = fmt.Errorf("%s: %s", err, out)
+		}
+		errC <- err
 	}()
 	if c.Timeout != nil {
 		select {