diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2019-02-13 22:55:52 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-02-13 22:55:52 +0100 |
| commit | dfc64e15d7f8b1715798fd68bd3ff74ae192b354 (patch) | |
| tree | 28fff3097e5705623bc48670c67dee64a5296329 /cmd/podman/start.go | |
| parent | 29d9ccf38158235ef37e4f5c20ad152bb396e3b9 (diff) | |
| parent | 9d4e7fe58b10c4130340a151a377cf7be8aaa810 (diff) | |
| download | podman-dfc64e15d7f8b1715798fd68bd3ff74ae192b354.tar.gz podman-dfc64e15d7f8b1715798fd68bd3ff74ae192b354.tar.bz2 podman-dfc64e15d7f8b1715798fd68bd3ff74ae192b354.zip | |
Merge pull request #2319 from mheon/unconditional_cleanup
Fix manual detach from containers to not wait for exit
Diffstat (limited to 'cmd/podman/start.go')
| -rw-r--r-- | cmd/podman/start.go | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/cmd/podman/start.go b/cmd/podman/start.go index 344719fca..d1434508d 100644 --- a/cmd/podman/start.go +++ b/cmd/podman/start.go @@ -108,6 +108,13 @@ func startCmd(c *cliconfig.StartValues) error { // attach to the container and also start it not already running err = startAttachCtr(ctr, os.Stdout, os.Stderr, inputStream, c.DetachKeys, sigProxy, !ctrRunning) + if errors.Cause(err) == libpod.ErrDetach { + // User manually detached + // Exit cleanly immediately + exitCode = 0 + return nil + } + if ctrRunning { return err } |