opensource/podman
1
0
Fork 0
mirror of https://github.com/containers/podman.git synced 2025-06-20 09:03:43 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3661 from openSUSE/nixos-friendly-config

Browse Source 
Update libpod.conf to be more friendly to NixOS
This commit is contained in:
OpenShift Merge Robot
2019-07-30 16:33:48 +02:00
committed by GitHub
parent 4196a59452 52ae51c79f
commit 1a008958d4
2 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
libpod.conf
View File

@ -12,7 +12,8 @@ conmon_path = [
"/usr/bin/conmon", "/usr/bin/conmon",
"/usr/sbin/conmon", "/usr/sbin/conmon",
"/usr/local/bin/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 # Environment variables to pass into conmon
@ -128,7 +129,8 @@ runc = [
"/usr/local/sbin/runc", "/usr/local/sbin/runc",
"/sbin/runc", "/sbin/runc",
"/bin/runc", "/bin/runc",
"/usr/lib/cri-o-runc/sbin/runc" "/usr/lib/cri-o-runc/sbin/runc",
"/run/current-system/sw/bin/runc",
] ]
crun = [ crun = [

2
libpod/runtime.go
View File

@ -293,6 +293,7 @@ func defaultRuntimeConfig() (RuntimeConfig, error) {
"/sbin/runc", "/sbin/runc",
"/bin/runc", "/bin/runc",
"/usr/lib/cri-o-runc/sbin/runc", "/usr/lib/cri-o-runc/sbin/runc",
"/run/current-system/sw/bin/runc",
}, },
}, },
ConmonPath: []string{ ConmonPath: []string{
@ -302,6 +303,7 @@ func defaultRuntimeConfig() (RuntimeConfig, error) {
"/usr/sbin/conmon", "/usr/sbin/conmon",
"/usr/local/bin/conmon", "/usr/local/bin/conmon",
"/usr/local/sbin/conmon", "/usr/local/sbin/conmon",
"/run/current-system/sw/bin/conmon",
}, },
ConmonEnvVars: []string{ ConmonEnvVars: []string{
"PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin", "PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin",