Merge pull request #10154 from tianon/fix-x-usage

Fix "-X" 6l usage ("define string data")
Upstream-commit: 4245952f79106acd0f8125ad05b5f7560f7ae524
Component: engine

components/engine/dockerversion/dockerversion.go

@@ -9,7 +9,7 @@ var (
 	GITCOMMIT string
 	VERSION   string
 
-	IAMSTATIC bool   // whether or not Docker itself was compiled statically via ./hack/make.sh binary
+	IAMSTATIC string // whether or not Docker itself was compiled statically via ./hack/make.sh binary ("true" or not "true")
 	INITSHA1  string // sha1sum of separate static dockerinit, if Docker itself was compiled dynamically via ./hack/make.sh dynbinary
 	INITPATH  string // custom location to search for a valid dockerinit binary (available for packagers as a last resort escape hatch)
 )

components/engine/utils/utils.go

@@ -94,7 +94,7 @@ func isValidDockerInitPath(target string, selfPath string) bool { // target and
 	if target == "" {
 		return false
 	}
-	if dockerversion.IAMSTATIC {
+	if dockerversion.IAMSTATIC == "true" {
 		if selfPath == "" {
 			return false
 		}