1 files changed, 6 insertions, 8 deletions
diff --git a/cmd/podman/healthcheck_run.go b/cmd/podman/healthcheck_run.go
index 111318d9c..3a2a8f333 100644
--- a/cmd/podman/healthcheck_run.go
+++ b/cmd/podman/healthcheck_run.go
@@ -2,8 +2,8 @@ package main
 
 import (
 	"fmt"
+
 	"github.com/containers/libpod/cmd/podman/cliconfig"
-	"github.com/containers/libpod/libpod"
 	"github.com/containers/libpod/pkg/adapter"
 	"github.com/pkg/errors"
 	"github.com/spf13/cobra"
@@ -42,13 +42,11 @@ func healthCheckCmd(c *cliconfig.HealthCheckValues) error {
 	if err != nil {
 		return errors.Wrap(err, "could not get runtime")
 	}
+	defer runtime.DeferredShutdown(false)
 	status, err := runtime.HealthCheck(c)
-	if err != nil {
-		if status == libpod.HealthCheckFailure {
-			fmt.Println("\nunhealthy")
-		}
-		return err
+	if err == nil && status == "unhealthy" {
+		exitCode = 1
 	}
-	fmt.Println("healthy")
-	return nil
+	fmt.Println(status)
+	return err
 }