From 0ab28c658952267af8e86a5b1055dd4b9cf0ec51 Mon Sep 17 00:00:00 2001
From: Shishir Mahajan <shishir.mahajan@redhat.com>
Date: Mon, 2 Mar 2015 16:45:45 -0500
Subject: [PATCH] Fix: docker -d -h start daemon instead of showing help menu

Signed-off-by: Shishir Mahajan <shishir.mahajan@redhat.com>
---
 docker/docker.go | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/docker/docker.go b/docker/docker.go
index 7d2a3bbdbc..0641830098 100644
--- a/docker/docker.go
+++ b/docker/docker.go
@@ -70,6 +70,10 @@ func main() {
 	setDefaultConfFlag(flTrustKey, defaultTrustKeyFile)
 
 	if *flDaemon {
+		if *flHelp {
+			flag.Usage()
+			return
+		}
 		mainDaemon()
 		return
 	}