diff options
| author | baude <bbaude@redhat.com> | 2019-08-14 09:29:47 -0500 |
|---|---|---|
| committer | baude <bbaude@redhat.com> | 2019-08-15 12:32:54 -0500 |
| commit | e6673012b5da79714a83e7d99ff0a23c8f401cb9 (patch) | |
| tree | 495b171f91eee6a42f07bab59bddc2a5b6e3f9a0 /libpod/oci.go | |
| parent | 3f1657d729b4f4c367b3e124621a6f3a9a5769d4 (diff) | |
| download | podman-e6673012b5da79714a83e7d99ff0a23c8f401cb9.tar.gz podman-e6673012b5da79714a83e7d99ff0a23c8f401cb9.tar.bz2 podman-e6673012b5da79714a83e7d99ff0a23c8f401cb9.zip | |
do not activate sd_notify support when varlink
add ability to not activate sd_notify when running under varlink as it
causes deadlocks and hangs.
Fixes: #3572
Signed-off-by: baude <bbaude@redhat.com>
Diffstat (limited to 'libpod/oci.go')
| -rw-r--r-- | libpod/oci.go | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/libpod/oci.go b/libpod/oci.go index 2eb004b84..4ba3114e3 100644 --- a/libpod/oci.go +++ b/libpod/oci.go @@ -60,6 +60,7 @@ type OCIRuntime struct { noPivot bool reservePorts bool supportsJSON bool + sdNotify bool } // ociError is used to parse the OCI runtime JSON log. It is not part of the @@ -87,6 +88,7 @@ func newOCIRuntime(name string, paths []string, conmonPath string, runtimeCfg *R runtime.logSizeMax = runtimeCfg.MaxLogSize runtime.noPivot = runtimeCfg.NoPivotRoot runtime.reservePorts = runtimeCfg.EnablePortReservation + runtime.sdNotify = runtimeCfg.SDNotify // TODO: probe OCI runtime for feature and enable automatically if // available. |