Преглед изворни кода

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 пре 10 година
родитељ
комит
da01690a0a
2 измењених фајлова са 2 додато и 2 уклоњено
  1. 1 1
      dockerversion/dockerversion.go
  2. 1 1
      utils/utils.go

+ 1 - 1
dockerversion/dockerversion.go

@@ -9,7 +9,7 @@ var (
 	GITCOMMIT string
 	GITCOMMIT string
 	VERSION   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
 	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)
 	INITPATH  string // custom location to search for a valid dockerinit binary (available for packagers as a last resort escape hatch)
 )
 )

+ 1 - 1
utils/utils.go

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