1. docker
  2. Commit da01690a0a22ced060d4fb4fc46cb545ff1604df
Browse code

Fix "-X" 6l usage ("define string data")

It turns out "-X" is only for strings! :)

Signed-off-by: Andrew "Tianon" Page <admwiggin@gmail.com>

Tianon Gravi authored on 2015/01/17 13:46:01
Showing 2 changed files
dockerversion/dockerversion.go
History View file @ da01690
... ... 
@@ -9,7 +9,7 @@ var (
9 9 
 	GITCOMMIT string
10 10 
 	VERSION   string
11 11
12 
-	IAMSTATIC bool   // whether or not Docker itself was compiled statically via ./hack/make.sh binary
12 
+	IAMSTATIC string // whether or not Docker itself was compiled statically via ./hack/make.sh binary ("true" or not "true")
13 13 
 	INITSHA1  string // sha1sum of separate static dockerinit, if Docker itself was compiled dynamically via ./hack/make.sh dynbinary
14 14 
 	INITPATH  string // custom location to search for a valid dockerinit binary (available for packagers as a last resort escape hatch)
15 15 
 )
utils/utils.go
History View file @ da01690
... ... 
@@ -94,7 +94,7 @@ func isValidDockerInitPath(target string, selfPath string) bool { // target and
94 94 
 	if target == "" {
95 95 
 		return false
96 96 
 	}
97 
-	if dockerversion.IAMSTATIC {
97 
+	if dockerversion.IAMSTATIC == "true" {
98 98 
 		if selfPath == "" {
99 99 
 			return false
100 100 
 		}