reexec: Use in-memory binary on linux instead of os.Args[0]

Tibor Vass · Tibor Vass · commit 5aee8807a676 · 2015-07-24T14:15:50.000-04:00
This keeps reexec working properly even if the on-disk binary was replaced.

Signed-off-by: Tibor Vass &lt;tibor@docker.com&gt;
diff --git a/pkg/reexec/command_linux.go b/pkg/reexec/command_linux.go
@@ -7,10 +7,16 @@ import (
 	"syscall"
 )
 
+// Self returns the path to the current process's binary.
+// Returns "/proc/self/exe".
+func Self() string {
+	return "/proc/self/exe"
+}
+
 // Command returns *exec.Cmd which have Path as current binary. Also it setting
 // SysProcAttr.Pdeathsig to SIGTERM.
-// For example if current binary is "docker" at "/usr/bin", then cmd.Path will
-// be set to "/usr/bin/docker".
+// This will use the in-memory version (/proc/self/exe) of the current binary,
+// it is thus safe to delete or replace the on-disk binary (os.Args[0]).
 func Command(args ...string) *exec.Cmd {
 	return &exec.Cmd{
 		Path: Self(),
diff --git a/pkg/reexec/command_windows.go b/pkg/reexec/command_windows.go
@@ -6,6 +6,12 @@ import (
 	"os/exec"
 )
 
+// Self returns the path to the current process's binary.
+// Uses os.Args[0].
+func Self() string {
+	return naiveSelf()
+}
+
 // Command returns *exec.Cmd which have Path as current binary.
 // For example if current binary is "docker.exe" at "C:\", then cmd.Path will
 // be set to "C:\docker.exe".
diff --git a/pkg/reexec/reexec.go b/pkg/reexec/reexec.go
@@ -30,8 +30,7 @@ func Init() bool {
 	return false
 }
 
-// Self returns the path to the current processes binary
-func Self() string {
+func naiveSelf() string {
 	name := os.Args[0]
 	if filepath.Base(name) == name {
 		if lp, err := exec.LookPath(name); err == nil {

Original file line number	Diff line number	Diff line change
`@@ -30,8 +30,7 @@ func Init() bool {`
`30`	`30`	`return false`
`31`	`31`	`}`
`32`	`32`
`33`		`-// Self returns the path to the current processes binary`
`34`		`-func Self() string {`
	`33`	`+func naiveSelf() string {`
`35`	`34`	`name := os.Args[0]`
`36`	`35`	`if filepath.Base(name) == name {`
`37`	`36`	`if lp, err := exec.LookPath(name); err == nil {`