diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2020-03-27 20:55:48 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-03-27 20:55:48 +0100 |
| commit | 3336b100ef3c1273df8ad3ebc44ce4738f8cf2c2 (patch) | |
| tree | d085118d9cf28ed6a8a7b40c1bd6bb5b772b10cc /libpod/oci_attach_linux.go | |
| parent | 1fe2fbb42114b9072a1caf359beff63042df90fd (diff) | |
| parent | 4352d585490f6c1eb7234ef4f92e0157083d69b3 (diff) | |
| download | podman-3336b100ef3c1273df8ad3ebc44ce4738f8cf2c2.tar.gz podman-3336b100ef3c1273df8ad3ebc44ce4738f8cf2c2.tar.bz2 podman-3336b100ef3c1273df8ad3ebc44ce4738f8cf2c2.zip | |
Merge pull request #4698 from rhatdan/containers.conf
Add support for containers.conf
Diffstat (limited to 'libpod/oci_attach_linux.go')
| -rw-r--r-- | libpod/oci_attach_linux.go | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/libpod/oci_attach_linux.go b/libpod/oci_attach_linux.go index 5fc46c31c..433993edb 100644 --- a/libpod/oci_attach_linux.go +++ b/libpod/oci_attach_linux.go @@ -9,6 +9,7 @@ import ( "os" "path/filepath" + "github.com/containers/common/pkg/config" "github.com/containers/libpod/libpod/define" "github.com/containers/libpod/pkg/errorhandling" "github.com/containers/libpod/pkg/kubeutils" @@ -104,7 +105,7 @@ func (c *Container) attachToExec(streams *AttachStreams, keys *string, sessionID defer errorhandling.CloseQuiet(startFd) defer errorhandling.CloseQuiet(attachFd) - detachString := define.DefaultDetachKeys + detachString := config.DefaultDetachKeys if keys != nil { detachString = *keys } |