exec:support to set custom log path

Signed-off-by: ningmingxiao <ning.mingxiao@zte.com.cn>

Author: ningmingxiao

command_linux.go

@@ -29,7 +29,24 @@ func (r *Runc) command(context context.Context, args ...string) *exec.Cmd {
 	if command == "" {
 		command = DefaultCommand
 	}
-	cmd := exec.CommandContext(context, command, append(r.args(), args...)...)
+	cmd := exec.CommandContext(context, command, append(r.args(""), args...)...)
+	cmd.SysProcAttr = &syscall.SysProcAttr{
+		Setpgid: r.Setpgid,
+	}
+	cmd.Env = filterEnv(os.Environ(), "NOTIFY_SOCKET") // NOTIFY_SOCKET introduces a special behavior in runc but should only be set if invoked from systemd
+	if r.PdeathSignal != 0 {
+		cmd.SysProcAttr.Pdeathsig = r.PdeathSignal
+	}
+
+	return cmd
+}
+
+func (r *Runc) commandWithCustomLog(context context.Context, logPath string, args ...string) *exec.Cmd {
+	command := r.Command
+	if command == "" {
+		command = DefaultCommand
+	}
+	cmd := exec.CommandContext(context, command, append(r.args(logPath), args...)...)
 	cmd.SysProcAttr = &syscall.SysProcAttr{
 		Setpgid: r.Setpgid,
 	}

command_other.go

@@ -29,7 +29,7 @@ func (r *Runc) command(context context.Context, args ...string) *exec.Cmd {
 	if command == "" {
 		command = DefaultCommand
 	}
-	cmd := exec.CommandContext(context, command, append(r.args(), args...)...)
+	cmd := exec.CommandContext(context, command, append(r.args(""), args...)...)
 	cmd.Env = os.Environ()
 	return cmd
 }

runc.go

@@ -228,6 +228,7 @@ func (r *Runc) Start(context context.Context, id string) error {
 // ExecOpts holds optional settings when starting an exec process with runc
 type ExecOpts struct {
 	IO
+	LogPath       string
 	PidFile       string
 	ConsoleSocket ConsoleSocket
 	Detach        bool
@@ -249,6 +250,7 @@ func (o *ExecOpts) args() (out []string, err error) {
 		}
 		out = append(out, "--pid-file", abs)
 	}
+
 	if len(o.ExtraArgs) > 0 {
 		out = append(out, o.ExtraArgs...)
 	}
@@ -280,7 +282,7 @@ func (r *Runc) Exec(context context.Context, id string, spec specs.Process, opts
 		return err
 	}
 	args = append(args, oargs...)
-	cmd := r.command(context, append(args, id)...)
+	cmd := r.commandWithCustomLog(context, opts.LogPath, append(args, id)...)
 	if opts.IO != nil {
 		opts.Set(cmd)
 	}
@@ -765,14 +767,23 @@ func (r *Runc) Features(context context.Context) (*features.Features, error) {
 	return &feat, nil
 }
 
-func (r *Runc) args() (out []string) {
+func (r *Runc) args(logPath string) (out []string) {
 	if r.Root != "" {
 		out = append(out, "--root", r.Root)
 	}
 	if r.Debug {
 		out = append(out, "--debug")
 	}
+
 	if r.Log != "" {
+		if logPath != "" {
+			out = append(out, "--log", logPath)
+		} else {
+			out = append(out, "--log", r.Log)
+		}
+	}
+
+	if logPath == "" && logPath != "" {
 		out = append(out, "--log", r.Log)
 	}
 	if r.LogFormat != none {