diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2019-07-30 16:33:48 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-07-30 16:33:48 +0200 |
| commit | 1a008958d42644aaf20e35a79463d9eea366ef55 (patch) | |
| tree | f7afb8f6cebe488aea7a724164967de6d4db0d76 | |
| parent | 4196a594521d89fa057602d9cb176726ee9db614 (diff) | |
| parent | 52ae51c79fc8a373c37a922ad237229400dbd968 (diff) | |
| download | podman-1a008958d42644aaf20e35a79463d9eea366ef55.tar.gz podman-1a008958d42644aaf20e35a79463d9eea366ef55.tar.bz2 podman-1a008958d42644aaf20e35a79463d9eea366ef55.zip | |
Merge pull request #3661 from openSUSE/nixos-friendly-config
Update libpod.conf to be more friendly to NixOS
| -rw-r--r-- | libpod.conf | 6 | ||||
| -rw-r--r-- | libpod/runtime.go | 2 |
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", |