diff options
Diffstat (limited to 'pkg')
| -rw-r--r-- | pkg/inspect/inspect.go | 2 | ||||
| -rw-r--r-- | pkg/varlinkapi/pods.go | 12 |
2 files changed, 7 insertions, 7 deletions
diff --git a/pkg/inspect/inspect.go b/pkg/inspect/inspect.go index be3818db8..b9230027c 100644 --- a/pkg/inspect/inspect.go +++ b/pkg/inspect/inspect.go @@ -170,7 +170,7 @@ type ContainerInspectData struct { NetworkSettings *NetworkSettings `json:"NetworkSettings"` //TODO ExitCommand []string `json:"ExitCommand"` Namespace string `json:"Namespace"` - IsPause bool `json:"IsPause"` + IsInfra bool `json:"IsInfra"` } // ContainerInspectState represents the state of a container. diff --git a/pkg/varlinkapi/pods.go b/pkg/varlinkapi/pods.go index 657aa0baf..d95b631f2 100644 --- a/pkg/varlinkapi/pods.go +++ b/pkg/varlinkapi/pods.go @@ -21,14 +21,14 @@ func (i *LibpodAPI) CreatePod(call iopodman.VarlinkCall, create iopodman.PodCrea if create.Name != "" { options = append(options, libpod.WithPodName(create.Name)) } - if len(create.Share) > 0 && !create.Pause { - return call.ReplyErrorOccurred("You cannot share kernel namespaces on the pod level without a pause container") + if len(create.Share) > 0 && !create.Infra { + return call.ReplyErrorOccurred("You cannot share kernel namespaces on the pod level without an infra container") } - if len(create.Share) == 0 && create.Pause { - return call.ReplyErrorOccurred("You must share kernel namespaces to run a pause container") + if len(create.Share) == 0 && create.Infra { + return call.ReplyErrorOccurred("You must share kernel namespaces to run an infra container") } - if create.Pause { - options = append(options, libpod.WithPauseContainer()) + if create.Infra { + options = append(options, libpod.WithInfraContainer()) nsOptions, err := shared.GetNamespaceOptions(create.Share) if err != nil { return err |