From 6136e835bf4b03356db4a82364abf005da584e69 Mon Sep 17 00:00:00 2001 From: Tianon Gravi Date: Fri, 16 Jan 2015 21:46:01 -0700 Subject: [PATCH] Fix "-X" 6l usage ("define string data") It turns out "-X" is only for strings! :) Signed-off-by: Andrew "Tianon" Page Upstream-commit: da01690a0a22ced060d4fb4fc46cb545ff1604df Component: engine --- components/engine/dockerversion/dockerversion.go | 2 +- components/engine/utils/utils.go | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/components/engine/dockerversion/dockerversion.go b/components/engine/dockerversion/dockerversion.go index c130ac2810..1898d5c61f 100644 --- a/components/engine/dockerversion/dockerversion.go +++ b/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) ) diff --git a/components/engine/utils/utils.go b/components/engine/utils/utils.go index ccb3ec00cb..a3e17b886d 100644 --- a/components/engine/utils/utils.go +++ b/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 }