Fix log/reap reexec

Signed-off-by: Brad Davidson <[email protected]>
k3s-io · Nov 1, 2021 · 2f3d398 · 2f3d398
1 parent 6223e3e
commit 2f3d398
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/pkg/cli/cmds/log_linux.go b/pkg/cli/cmds/log_linux.go
@@ -58,15 +58,15 @@ func forkIfLoggingOrReaping() error {
 		args := append([]string{version.Program}, os.Args[1:]...)
 		env := append(os.Environ(), "_K3S_LOG_REEXEC_=true", "NOTIFY_SOCKET=")
 		cmd := &exec.Cmd{
-			Path:   os.Args[0],
+			Path:   "/proc/self/exe",
 			Dir:    pwd,
 			Args:   args,
 			Env:    env,
 			Stdin:  os.Stdin,
 			Stdout: stdout,
 			Stderr: stderr,
 			SysProcAttr: &syscall.SysProcAttr{
-				Setsid: true,
+				Pdeathsig: unix.SIGTERM,
 			},
 		}
 		if err := cmd.Start(); err != nil {