Merge pull request #11420 from estesp/reexec-path-fix

Fix relative path execution of docker daemon in reexec.Self()
This commit is contained in:
Jessie Frazelle 2015-03-16 14:57:25 -07:00
commit 8cd2a81fd8

View file

@ -35,8 +35,14 @@ func Self() string {
name := os.Args[0]
if filepath.Base(name) == name {
if lp, err := exec.LookPath(name); err == nil {
name = lp
return lp
}
}
// handle conversion of relative paths to absolute
if absName, err := filepath.Abs(name); err == nil {
return absName
}
// if we coudn't get absolute name, return original
// (NOTE: Go only errors on Abs() if os.Getwd fails)
return name
}