beenull/moby
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

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

Browse source 
Fix "-X" 6l usage ("define string data")
This commit is contained in:
Jessie Frazelle 2015-01-16 20:55:16 -08:00
commit 4245952f79
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
dockerversion/dockerversion.go
View file

@ -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)
)

2
utils/utils.go
View file

@ -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
}