merge #4268 into opencontainers/runc:main

Kir Kolyshkin (2):
  libct: fix a comment
  libct/system: rm Execv

LGTMs: AkihiroSuda cyphar
This commit is contained in:
Aleksa Sarai
2024-05-08 16:34:13 +10:00
2 changed files with 1 additions and 10 deletions
+1 -1
View File
@@ -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 {
-9
View File
@@ -7,7 +7,6 @@ import (
"fmt"
"io"
"os"
"os/exec"
"strconv"
"syscall"
"unsafe"
@@ -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)