Skip to content

K
k3s
Commit 2f3d398c authored by Brad Davidson's avatar Brad Davidson Committed by Brad Davidson
Browse files
Options

Fix log/reap reexec

Signed-off-by: 's avatarBrad Davidson <brad.davidson@rancher.com>
parent 6223e3e8
Hide whitespace changes
Inline Side-by-side
Showing with 2 additions and 2 deletions
pkg/cli/cmds/log_linux.go
View file @ 2f3d398c
...@@ -58,7 +58,7 @@ func forkIfLoggingOrReaping() error { ...@@ -58,7 +58,7 @@ func forkIfLoggingOrReaping() error {
args := append([]string{version.Program}, os.Args[1:]...) args := append([]string{version.Program}, os.Args[1:]...)
env := append(os.Environ(), "_K3S_LOG_REEXEC_=true", "NOTIFY_SOCKET=") env := append(os.Environ(), "_K3S_LOG_REEXEC_=true", "NOTIFY_SOCKET=")
cmd := &exec.Cmd{ cmd := &exec.Cmd{
Path: os.Args[0], Path: "/proc/self/exe",
Dir: pwd, Dir: pwd,
Args: args, Args: args,
Env: env, Env: env,
...@@ -66,7 +66,7 @@ func forkIfLoggingOrReaping() error { ...@@ -66,7 +66,7 @@ func forkIfLoggingOrReaping() error {
Stdout: stdout, Stdout: stdout,
Stderr: stderr, Stderr: stderr,
SysProcAttr: &syscall.SysProcAttr{ SysProcAttr: &syscall.SysProcAttr{
Setsid: true, Pdeathsig: unix.SIGTERM,
}, },
} }
if err := cmd.Start(); err != nil { if err := cmd.Start(); err != nil {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment