diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2020-06-18 11:20:19 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-06-18 11:20:19 -0400 |
| commit | e6b9b3ab227729e72f52ddab94c024174ab8a442 (patch) | |
| tree | 1c1e6c9bd1c595410d179b3ebf9ea868cddb587e /pkg/varlinkapi/containers.go | |
| parent | 2e621aece054e9ba8cd2fb30254c8513e7caf1b6 (diff) | |
| parent | b20619e5b0dfa6c63b25c3fd9a7ae6188bee2b4c (diff) | |
| download | podman-e6b9b3ab227729e72f52ddab94c024174ab8a442.tar.gz podman-e6b9b3ab227729e72f52ddab94c024174ab8a442.tar.bz2 podman-e6b9b3ab227729e72f52ddab94c024174ab8a442.zip | |
Merge pull request #6656 from mheon/recursive_init
Allow recursive dependency start with Init()
Diffstat (limited to 'pkg/varlinkapi/containers.go')
| -rw-r--r-- | pkg/varlinkapi/containers.go | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/pkg/varlinkapi/containers.go b/pkg/varlinkapi/containers.go index 291353cad..a81d19131 100644 --- a/pkg/varlinkapi/containers.go +++ b/pkg/varlinkapi/containers.go @@ -385,7 +385,7 @@ func (i *VarlinkAPI) InitContainer(call iopodman.VarlinkCall, name string) error if err != nil { return call.ReplyContainerNotFound(name, err.Error()) } - if err := ctr.Init(getContext()); err != nil { + if err := ctr.Init(getContext(), false); err != nil { if errors.Cause(err) == define.ErrCtrStateInvalid { return call.ReplyInvalidState(ctr.ID(), err.Error()) } @@ -557,7 +557,7 @@ func (i *VarlinkAPI) GetAttachSockets(call iopodman.VarlinkCall, name string) er // If the container hasn't been run, we need to run init // so the conmon sockets get created. if status == define.ContainerStateConfigured || status == define.ContainerStateStopped { - if err := ctr.Init(getContext()); err != nil { + if err := ctr.Init(getContext(), false); err != nil { return call.ReplyErrorOccurred(err.Error()) } } |