Skip to content

Commit 151f480

Browse files
committed
merge #4268 into opencontainers/runc:main
Kir Kolyshkin (2): libct: fix a comment libct/system: rm Execv LGTMs: AkihiroSuda cyphar
2 parents 6cf790c + bac5064 commit 151f480

File tree

2 files changed

+1
-10
lines changed

2 files changed

+1
-10
lines changed

libcontainer/standard_init_linux.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -167,7 +167,7 @@ func (l *linuxStandardInit) Init() error {
167167
}
168168
}
169169

170-
// Tell our parent that we're ready to Execv. This must be done before the
170+
// Tell our parent that we're ready to exec. This must be done before the
171171
// Seccomp rules have been applied, because we need to be able to read and
172172
// write to a socket.
173173
if err := syncParentReady(l.pipe); err != nil {

libcontainer/system/linux.go

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@ import (
77
"fmt"
88
"io"
99
"os"
10-
"os/exec"
1110
"strconv"
1211
"syscall"
1312
"unsafe"
@@ -36,14 +35,6 @@ func (p ParentDeathSignal) Set() error {
3635
return SetParentDeathSignal(uintptr(p))
3736
}
3837

39-
func Execv(cmd string, args []string, env []string) error {
40-
name, err := exec.LookPath(cmd)
41-
if err != nil {
42-
return err
43-
}
44-
return Exec(name, args, env)
45-
}
46-
4738
func Exec(cmd string, args []string, env []string) error {
4839
for {
4940
err := unix.Exec(cmd, args, env)

0 commit comments

Comments
 (0)