InTheForest/moby
1
0
Fork 0
mirror of https://github.com/moby/moby.git synced 2026-01-11 18:51:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

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

Signed-off-by: Andrew "Tianon" Page <admwiggin@gmail.com>
This commit is contained in:
Tianon Gravi
2015-01-16 21:46:01 -07:00
parent 78b7a484db
commit da01690a0a
2 changed files with 2 additions and 2 deletions
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 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)
) )

2
utils/utils.go
View File

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