Skip to content

Commit

Permalink
merge #4268 into opencontainers/runc:main
Browse files Browse the repository at this point in the history
Kir Kolyshkin (2):
  libct: fix a comment
  libct/system: rm Execv

LGTMs: AkihiroSuda cyphar
  • Loading branch information
cyphar committed May 8, 2024
2 parents 6cf790c + bac5064 commit 151f480
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 10 deletions.
2 changes: 1 addition & 1 deletion libcontainer/standard_init_linux.go
Original file line number Diff line number Diff line change
Expand Up @@ -167,7 +167,7 @@ func (l *linuxStandardInit) Init() error {
}
}

// Tell our parent that we're ready to Execv. This must be done before the
// Tell our parent that we're ready to exec. This must be done before the
// Seccomp rules have been applied, because we need to be able to read and
// write to a socket.
if err := syncParentReady(l.pipe); err != nil {
Expand Down
9 changes: 0 additions & 9 deletions libcontainer/system/linux.go
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@ import (
"fmt"
"io"
"os"
"os/exec"
"strconv"
"syscall"
"unsafe"
Expand Down Expand Up @@ -36,14 +35,6 @@ func (p ParentDeathSignal) Set() error {
return SetParentDeathSignal(uintptr(p))
}

func Execv(cmd string, args []string, env []string) error {
name, err := exec.LookPath(cmd)
if err != nil {
return err
}
return Exec(name, args, env)
}

func Exec(cmd string, args []string, env []string) error {
for {
err := unix.Exec(cmd, args, env)
Expand Down

0 comments on commit 151f480

Please sign in to comment.