diff options
| -rw-r--r-- | install.md | 2 | ||||
| -rw-r--r-- | libpod.conf | 7 | ||||
| -rw-r--r-- | libpod/container_internal.go | 2 | ||||
| -rw-r--r-- | libpod/pod_internal.go | 2 | ||||
| -rw-r--r-- | libpod/runtime.go | 2 |
5 files changed, 12 insertions, 3 deletions
diff --git a/install.md b/install.md index 4b2c5a119..43eddf1cc 100644 --- a/install.md +++ b/install.md @@ -193,7 +193,7 @@ To build from source, use the following: git clone https://github.com/containers/conmon cd conmon make -sudo install -D -m 755 bin/conmon /usr/libexec/podman/conmon +sudo make podman ``` #### runc diff --git a/libpod.conf b/libpod.conf index 45e955c36..32f7a56ae 100644 --- a/libpod.conf +++ b/libpod.conf @@ -12,6 +12,8 @@ conmon_path = [ "/usr/local/libexec/crio/conmon", "/usr/bin/conmon", "/usr/sbin/conmon", + "/usr/local/bin/conmon", + "/usr/local/sbin/conmon", "/usr/lib/podman/bin/conmon", "/usr/lib/crio/bin/conmon" ] @@ -122,6 +124,11 @@ runc = [ "/usr/lib/cri-o-runc/sbin/runc" ] +crun = [ + "/usr/bin/crun", + "/usr/local/bin/crun", +] + # The [runtimes] table MUST be the last thing in this file. # (Unless another table is added) # TOML does not provide a way to end a table other than a further table being diff --git a/libpod/container_internal.go b/libpod/container_internal.go index 3e2fd0c44..56fd27afb 100644 --- a/libpod/container_internal.go +++ b/libpod/container_internal.go @@ -509,7 +509,7 @@ func (c *Container) refresh() error { // We need to pick up a new lock lock, err := c.runtime.lockManager.AllocateAndRetrieveLock(c.config.LockID) if err != nil { - return errors.Wrapf(err, "error acquiring lock for container %s", c.ID()) + return errors.Wrapf(err, "error acquiring lock %d for container %s", c.config.LockID, c.ID()) } c.lock = lock diff --git a/libpod/pod_internal.go b/libpod/pod_internal.go index 1fcb5b1a6..23359d841 100644 --- a/libpod/pod_internal.go +++ b/libpod/pod_internal.go @@ -58,7 +58,7 @@ func (p *Pod) refresh() error { // Retrieve the pod's lock lock, err := p.runtime.lockManager.AllocateAndRetrieveLock(p.config.LockID) if err != nil { - return errors.Wrapf(err, "error retrieving lock for pod %s", p.ID()) + return errors.Wrapf(err, "error retrieving lock %d for pod %s", p.config.LockID, p.ID()) } p.lock = lock diff --git a/libpod/runtime.go b/libpod/runtime.go index d4d34242c..78fa22ec8 100644 --- a/libpod/runtime.go +++ b/libpod/runtime.go @@ -291,6 +291,8 @@ func defaultRuntimeConfig() (RuntimeConfig, error) { "/usr/local/libexec/crio/conmon", "/usr/bin/conmon", "/usr/sbin/conmon", + "/usr/local/bin/conmon", + "/usr/local/sbin/conmon", "/usr/lib/crio/bin/conmon", }, ConmonEnvVars: []string{ |