summaryrefslogtreecommitdiffstats
path: root/pkgs/applications/virtualization/podman/hardcode-paths.patch
diff options
context:
space:
mode:
Diffstat (limited to 'pkgs/applications/virtualization/podman/hardcode-paths.patch')
-rw-r--r--pkgs/applications/virtualization/podman/hardcode-paths.patch109
1 files changed, 109 insertions, 0 deletions
diff --git a/pkgs/applications/virtualization/podman/hardcode-paths.patch b/pkgs/applications/virtualization/podman/hardcode-paths.patch
new file mode 100644
index 000000000000..05394f62877a
--- /dev/null
+++ b/pkgs/applications/virtualization/podman/hardcode-paths.patch
@@ -0,0 +1,109 @@
+diff --git a/vendor/github.com/containers/common/pkg/config/default.go b/vendor/github.com/containers/common/pkg/config/default.go
+index 19c4bb6bf..2743de4b2 100644
+--- a/vendor/github.com/containers/common/pkg/config/default.go
++++ b/vendor/github.com/containers/common/pkg/config/default.go
+@@ -364,75 +364,34 @@ func defaultEngineConfig() (*EngineConfig, error) {
+ c.Retry = 3
+ c.OCIRuntimes = map[string][]string{
+ "crun": {
+- "/usr/bin/crun",
+- "/usr/sbin/crun",
+- "/usr/local/bin/crun",
+- "/usr/local/sbin/crun",
+- "/sbin/crun",
+- "/bin/crun",
+- "/run/current-system/sw/bin/crun",
++ "@crun@/bin/crun",
+ },
+ "crun-vm": {
+- "/usr/bin/crun-vm",
+- "/usr/local/bin/crun-vm",
+- "/usr/local/sbin/crun-vm",
+- "/sbin/crun-vm",
+- "/bin/crun-vm",
+- "/run/current-system/sw/bin/crun-vm",
++ // TODO: "@crun-vm@/bin/crun-vm",
+ },
+ "crun-wasm": {
+- "/usr/bin/crun-wasm",
+- "/usr/sbin/crun-wasm",
+- "/usr/local/bin/crun-wasm",
+- "/usr/local/sbin/crun-wasm",
+- "/sbin/crun-wasm",
+- "/bin/crun-wasm",
+- "/run/current-system/sw/bin/crun-wasm",
++ // TODO: "@crun-wasm@/bin/crun-wasm",
+ },
+ "runc": {
+- "/usr/bin/runc",
+- "/usr/sbin/runc",
+- "/usr/local/bin/runc",
+- "/usr/local/sbin/runc",
+- "/sbin/runc",
+- "/bin/runc",
+- "/usr/lib/cri-o-runc/sbin/runc",
+- "/run/current-system/sw/bin/runc",
++ "@runc@/bin/runc",
+ },
+ "runj": {
+- "/usr/local/bin/runj",
++ // TODO: "@runj@/bin/runj",
+ },
+ "kata": {
+- "/usr/bin/kata-runtime",
+- "/usr/sbin/kata-runtime",
+- "/usr/local/bin/kata-runtime",
+- "/usr/local/sbin/kata-runtime",
+- "/sbin/kata-runtime",
+- "/bin/kata-runtime",
+- "/usr/bin/kata-qemu",
+- "/usr/bin/kata-fc",
++ // TODO: "@kata@/bin/kata",
+ },
+ "runsc": {
+- "/usr/bin/runsc",
+- "/usr/sbin/runsc",
+- "/usr/local/bin/runsc",
+- "/usr/local/sbin/runsc",
+- "/bin/runsc",
+- "/sbin/runsc",
+- "/run/current-system/sw/bin/runsc",
++ "@gvisor@/bin/runsc",
+ },
+ "youki": {
+- "/usr/local/bin/youki",
+- "/usr/bin/youki",
+- "/bin/youki",
+- "/run/current-system/sw/bin/youki",
++ "@youki@/bin/youki",
+ },
+ "krun": {
+- "/usr/bin/krun",
+- "/usr/local/bin/krun",
++ // TODO: "@krun@/bin/krun",
+ },
+ "ocijail": {
+- "/usr/local/bin/ocijail",
++ // TODO: "@ocijail@/bin/ocijail",
+ },
+ }
+ c.PlatformToOCIRuntime = map[string]string{
+@@ -443,16 +402,9 @@ func defaultEngineConfig() (*EngineConfig, error) {
+ // Needs to be called after populating c.OCIRuntimes.
+ c.OCIRuntime = c.findRuntime()
+
+- c.ConmonEnvVars.Set([]string{"PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin"})
++ c.ConmonEnvVars.Set([]string{})
+ c.ConmonPath.Set([]string{
+- "/usr/libexec/podman/conmon",
+- "/usr/local/libexec/podman/conmon",
+- "/usr/local/lib/podman/conmon",
+- "/usr/bin/conmon",
+- "/usr/sbin/conmon",
+- "/usr/local/bin/conmon",
+- "/usr/local/sbin/conmon",
+- "/run/current-system/sw/bin/conmon",
++ "@conmon@/bin/conmon",
+ })
+ c.ConmonRsPath.Set([]string{
+ "/usr/libexec/podman/conmonrs",