pyrox.dev
1diff --git a/vendor/github.com/containers/common/pkg/config/default.go b/vendor/github.com/containers/common/pkg/config/default.go
2index 3a6d804ad..5628e2bf6 100644
3--- a/vendor/github.com/containers/common/pkg/config/default.go
4+++ b/vendor/github.com/containers/common/pkg/config/default.go
5@@ -366,75 +366,34 @@ func defaultEngineConfig() (*EngineConfig, error) {
6 c.Retry = 3
7 c.OCIRuntimes = map[string][]string{
8 "crun": {
9- "/usr/bin/crun",
10- "/usr/sbin/crun",
11- "/usr/local/bin/crun",
12- "/usr/local/sbin/crun",
13- "/sbin/crun",
14- "/bin/crun",
15- "/run/current-system/sw/bin/crun",
16+ "@bin_path@/bin/crun",
17 },
18 "crun-vm": {
19- "/usr/bin/crun-vm",
20- "/usr/local/bin/crun-vm",
21- "/usr/local/sbin/crun-vm",
22- "/sbin/crun-vm",
23- "/bin/crun-vm",
24- "/run/current-system/sw/bin/crun-vm",
25+ "@bin_path@/bin/crun-vm",
26 },
27 "crun-wasm": {
28- "/usr/bin/crun-wasm",
29- "/usr/sbin/crun-wasm",
30- "/usr/local/bin/crun-wasm",
31- "/usr/local/sbin/crun-wasm",
32- "/sbin/crun-wasm",
33- "/bin/crun-wasm",
34- "/run/current-system/sw/bin/crun-wasm",
35+ "@bin_path@/bin/crun-wasm",
36 },
37 "runc": {
38- "/usr/bin/runc",
39- "/usr/sbin/runc",
40- "/usr/local/bin/runc",
41- "/usr/local/sbin/runc",
42- "/sbin/runc",
43- "/bin/runc",
44- "/usr/lib/cri-o-runc/sbin/runc",
45- "/run/current-system/sw/bin/runc",
46+ "@bin_path@/bin/runc",
47 },
48 "runj": {
49- "/usr/local/bin/runj",
50+ "@bin_path@/bin/runj",
51 },
52 "kata": {
53- "/usr/bin/kata-runtime",
54- "/usr/sbin/kata-runtime",
55- "/usr/local/bin/kata-runtime",
56- "/usr/local/sbin/kata-runtime",
57- "/sbin/kata-runtime",
58- "/bin/kata-runtime",
59- "/usr/bin/kata-qemu",
60- "/usr/bin/kata-fc",
61+ "@bin_path@/bin/kata-runtime",
62 },
63 "runsc": {
64- "/usr/bin/runsc",
65- "/usr/sbin/runsc",
66- "/usr/local/bin/runsc",
67- "/usr/local/sbin/runsc",
68- "/bin/runsc",
69- "/sbin/runsc",
70- "/run/current-system/sw/bin/runsc",
71+ "@bin_path@/bin/runsc",
72 },
73 "youki": {
74- "/usr/local/bin/youki",
75- "/usr/bin/youki",
76- "/bin/youki",
77- "/run/current-system/sw/bin/youki",
78+ "@bin_path@/bin/youki",
79 },
80 "krun": {
81- "/usr/bin/krun",
82- "/usr/local/bin/krun",
83+ "@bin_path@/bin/krun",
84 },
85 "ocijail": {
86- "/usr/local/bin/ocijail",
87+ "@bin_path@/bin/ocijail",
88 },
89 }
90 c.PlatformToOCIRuntime = map[string]string{
91@@ -445,26 +404,12 @@ func defaultEngineConfig() (*EngineConfig, error) {
92 // Needs to be called after populating c.OCIRuntimes.
93 c.OCIRuntime = c.findRuntime()
94
95- c.ConmonEnvVars.Set([]string{"PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin"})
96+ c.ConmonEnvVars.Set([]string{})
97 c.ConmonPath.Set([]string{
98- "/usr/libexec/podman/conmon",
99- "/usr/local/libexec/podman/conmon",
100- "/usr/local/lib/podman/conmon",
101- "/usr/bin/conmon",
102- "/usr/sbin/conmon",
103- "/usr/local/bin/conmon",
104- "/usr/local/sbin/conmon",
105- "/run/current-system/sw/bin/conmon",
106+ "@bin_path@/bin/conmon",
107 })
108 c.ConmonRsPath.Set([]string{
109- "/usr/libexec/podman/conmonrs",
110- "/usr/local/libexec/podman/conmonrs",
111- "/usr/local/lib/podman/conmonrs",
112- "/usr/bin/conmonrs",
113- "/usr/sbin/conmonrs",
114- "/usr/local/bin/conmonrs",
115- "/usr/local/sbin/conmonrs",
116- "/run/current-system/sw/bin/conmonrs",
117+ "@bin_path@/bin/conmonrs",
118 })
119 c.PullPolicy = DefaultPullPolicy
120 c.RuntimeSupportsJSON.Set([]string{