aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--libpod.conf6
-rw-r--r--libpod/runtime.go2
2 files changed, 6 insertions, 2 deletions
diff --git a/libpod.conf b/libpod.conf
index c92f60a10..6dd021c02 100644
--- a/libpod.conf
+++ b/libpod.conf
@@ -12,7 +12,8 @@ conmon_path = [
"/usr/bin/conmon",
"/usr/sbin/conmon",
"/usr/local/bin/conmon",
- "/usr/local/sbin/conmon"
+ "/usr/local/sbin/conmon",
+ "/run/current-system/sw/bin/conmon",
]
# Environment variables to pass into conmon
@@ -128,7 +129,8 @@ runc = [
"/usr/local/sbin/runc",
"/sbin/runc",
"/bin/runc",
- "/usr/lib/cri-o-runc/sbin/runc"
+ "/usr/lib/cri-o-runc/sbin/runc",
+ "/run/current-system/sw/bin/runc",
]
crun = [
diff --git a/libpod/runtime.go b/libpod/runtime.go
index 28958e932..bb6bfbfcc 100644
--- a/libpod/runtime.go
+++ b/libpod/runtime.go
@@ -293,6 +293,7 @@ func defaultRuntimeConfig() (RuntimeConfig, error) {
"/sbin/runc",
"/bin/runc",
"/usr/lib/cri-o-runc/sbin/runc",
+ "/run/current-system/sw/bin/runc",
},
},
ConmonPath: []string{
@@ -302,6 +303,7 @@ func defaultRuntimeConfig() (RuntimeConfig, error) {
"/usr/sbin/conmon",
"/usr/local/bin/conmon",
"/usr/local/sbin/conmon",
+ "/run/current-system/sw/bin/conmon",
},
ConmonEnvVars: []string{
"PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin",