diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2019-11-07 15:16:36 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-11-07 15:16:36 +0100 |
| commit | a889fd397ae56f16c71be2bf8b0a886def1559fa (patch) | |
| tree | 0341a13c2f8513f5149868b594c151a737047633 /pkg/adapter/containers.go | |
| parent | aad29045531152f6b4763fe6a45e8c9daabaa0e0 (diff) | |
| parent | 7c623bd41ff3d53412531343a94e4fa5fead759f (diff) | |
| download | podman-a889fd397ae56f16c71be2bf8b0a886def1559fa.tar.gz podman-a889fd397ae56f16c71be2bf8b0a886def1559fa.tar.bz2 podman-a889fd397ae56f16c71be2bf8b0a886def1559fa.zip | |
Merge pull request #4441 from rhatdan/detach
Allow users to disable detach keys
Diffstat (limited to 'pkg/adapter/containers.go')
| -rw-r--r-- | pkg/adapter/containers.go | 11 |
1 files changed, 1 insertions, 10 deletions
diff --git a/pkg/adapter/containers.go b/pkg/adapter/containers.go index 64550f545..a09466243 100644 --- a/pkg/adapter/containers.go +++ b/pkg/adapter/containers.go @@ -400,17 +400,8 @@ func (r *LocalRuntime) Run(ctx context.Context, c *cliconfig.RunValues, exitCode } } - config, err := r.Runtime.GetConfig() - if err != nil { - return exitCode, err - } - detachKeys := c.String("detach-keys") - if detachKeys == "" { - detachKeys = config.DetachKeys - } - // if the container was created as part of a pod, also start its dependencies, if any. - if err := StartAttachCtr(ctx, ctr, outputStream, errorStream, inputStream, detachKeys, c.Bool("sig-proxy"), true, c.IsSet("pod")); err != nil { + if err := StartAttachCtr(ctx, ctr, outputStream, errorStream, inputStream, c.String("detach-keys"), c.Bool("sig-proxy"), true, c.IsSet("pod")); err != nil { // We've manually detached from the container // Do not perform cleanup, or wait for container exit code // Just exit immediately |