Skip to content

Commit d9c52ec

Browse files
committed
remove runtime wrapper driver detection
This will be handled by the runtime itself. Signed-off-by: Jean-Francois Roy <[email protected]>
1 parent 0c1e76a commit d9c52ec

File tree

1 file changed

+0
-25
lines changed

1 file changed

+0
-25
lines changed

tools/container/wrapper/wrapper.go

-25
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,6 @@ import (
2222
"io/fs"
2323
"log"
2424
"os"
25-
"os/exec"
26-
"path/filepath"
2725
"strings"
2826

2927
"golang.org/x/sys/unix"
@@ -34,18 +32,6 @@ func main() {
3432
if err != nil {
3533
log.Fatalf("failed to get executable: %v", err)
3634
}
37-
if isRuntimeWrapper(program) && !isNvidiaModuleLoaded() {
38-
log.Println("nvidia driver modules are not yet loaded, invoking runc directly")
39-
program, err := exec.LookPath("runc")
40-
if err != nil {
41-
log.Fatalf("failed to find runc: %v", err)
42-
}
43-
argv := []string{"runc"}
44-
argv = append(argv, os.Args[1:]...)
45-
if err := unix.Exec(program, argv, os.Environ()); err != nil {
46-
log.Fatalf("failed to exec %s: %v", program, err)
47-
}
48-
}
4935
argv := makeArgv(program)
5036
envv := makeEnvv(program)
5137
if err := unix.Exec(program+".real", argv, envv); err != nil {
@@ -54,17 +40,6 @@ func main() {
5440

5541
}
5642

57-
func isRuntimeWrapper(program string) bool {
58-
return filepath.Base(program) == "nvidia-container-runtime" ||
59-
filepath.Base(program) == "nvidia-container-runtime.cdi" ||
60-
filepath.Base(program) == "nvidia-container-runtime.legacy"
61-
}
62-
63-
func isNvidiaModuleLoaded() bool {
64-
_, err := os.Stat("/proc/driver/nvidia/version")
65-
return err == nil
66-
}
67-
6843
func makeArgv(program string) []string {
6944
argv := []string{os.Args[0] + ".real"}
7045
f, err := os.Open(program + ".argv")

0 commit comments

Comments
 (0)