diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2019-08-18 19:25:13 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-08-18 19:25:13 +0200 |
| commit | 438cbf4c8960db0b59a25a3fb38a778e24a69a40 (patch) | |
| tree | cd88f2c036854caabc4a41bf4030a6d11fd86a4f /libpod/oci.go | |
| parent | 76f327f73ff9f5ae67a30186007685b8a2e21d67 (diff) | |
| parent | e6673012b5da79714a83e7d99ff0a23c8f401cb9 (diff) | |
| download | podman-438cbf4c8960db0b59a25a3fb38a778e24a69a40.tar.gz podman-438cbf4c8960db0b59a25a3fb38a778e24a69a40.tar.bz2 podman-438cbf4c8960db0b59a25a3fb38a778e24a69a40.zip | |
Merge pull request #3813 from baude/nofds
do not activate sd_notify support when varlink
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. |