3 files changed, 20 insertions, 19 deletions

diff --git a/cmd/podman/shared/container.go b/cmd/podman/shared/container.go
index 4adb9f0bb..de850a7c3 100644
--- a/cmd/podman/shared/container.go
+++ b/cmd/podman/shared/container.go
@@ -51,7 +51,7 @@ type PsOptions struct {
 // container related information
 type BatchContainerStruct struct {
 	ConConfig   *libpod.ContainerConfig
-	ConState    libpod.ContainerStatus
+	ConState    define.ContainerStatus
 	ExitCode    int32
 	Exited      bool
 	Pid         int
@@ -71,7 +71,7 @@ type PsContainerOutput struct {
 	Names     string
 	IsInfra   bool
 	Status    string
-	State     libpod.ContainerStatus
+	State     define.ContainerStatus
 	Pid       int
 	Size      *ContainerSize
 	Pod       string
@@ -113,7 +113,7 @@ type ContainerSize struct {
 // be called in PBatch
 func NewBatchContainer(ctr *libpod.Container, opts PsOptions) (PsContainerOutput, error) {
 	var (
-		conState  libpod.ContainerStatus
+		conState  define.ContainerStatus
 		command   string
 		created   string
 		status    string
@@ -184,16 +184,16 @@ func NewBatchContainer(ctr *libpod.Container, opts PsOptions) (PsContainerOutput
 	}
 
 	switch conState.String() {
-	case libpod.ContainerStateExited.String():
+	case define.ContainerStateExited.String():
 		fallthrough
-	case libpod.ContainerStateStopped.String():
+	case define.ContainerStateStopped.String():
 		exitedSince := units.HumanDuration(time.Since(exitedAt))
 		status = fmt.Sprintf("Exited (%d) %s ago", exitCode, exitedSince)
-	case libpod.ContainerStateRunning.String():
+	case define.ContainerStateRunning.String():
 		status = "Up " + units.HumanDuration(time.Since(startedAt)) + " ago"
-	case libpod.ContainerStatePaused.String():
+	case define.ContainerStatePaused.String():
 		status = "Paused"
-	case libpod.ContainerStateCreated.String(), libpod.ContainerStateConfigured.String():
+	case define.ContainerStateCreated.String(), define.ContainerStateConfigured.String():
 		status = "Created"
 	default:
 		status = "Error"
@@ -323,9 +323,9 @@ func generateContainerFilterFuncs(filter, filterValue string, r *libpod.Runtime)
 				filterValue = "exited"
 			}
 			state := status.String()
-			if status == libpod.ContainerStateConfigured {
+			if status == define.ContainerStateConfigured {
 				state = "created"
-			} else if status == libpod.ContainerStateStopped {
+			} else if status == define.ContainerStateStopped {
 				state = "exited"
 			}
 			return state == filterValue
@@ -490,7 +490,7 @@ func PBatch(containers []*libpod.Container, workers int, opts PsOptions) []PsCon
 		// We sort out running vs non-running here to save lots of copying
 		// later.
 		if !opts.All && !opts.Latest && opts.Last < 1 {
-			if !res.IsInfra && res.State == libpod.ContainerStateRunning {
+			if !res.IsInfra && res.State == define.ContainerStateRunning {
 				psResults = append(psResults, res)
 			}
 		} else {
@@ -505,7 +505,7 @@ func PBatch(containers []*libpod.Container, workers int, opts PsOptions) []PsCon
 func BatchContainerOp(ctr *libpod.Container, opts PsOptions) (BatchContainerStruct, error) {
 	var (
 		conConfig   *libpod.ContainerConfig
-		conState    libpod.ContainerStatus
+		conState    define.ContainerStatus
 		err         error
 		exitCode    int32
 		exited      bool
diff --git a/cmd/podman/shared/create.go b/cmd/podman/shared/create.go
index 4491e5c1b..31ac9a3a1 100644
--- a/cmd/podman/shared/create.go
+++ b/cmd/podman/shared/create.go
@@ -56,7 +56,7 @@ func CreateContainer(ctx context.Context, c *GenericCLIResults, runtime *libpod.
 	}
 
 	if c.IsSet("cidfile") && os.Geteuid() == 0 {
-		cidFile, err = libpod.OpenExclusiveFile(c.String("cidfile"))
+		cidFile, err = util.OpenExclusiveFile(c.String("cidfile"))
 		if err != nil && os.IsExist(err) {
 			return nil, nil, errors.Errorf("container id file exists. Ensure another container is not using it or delete %s", c.String("cidfile"))
 		}
diff --git a/cmd/podman/shared/pod.go b/cmd/podman/shared/pod.go
index 3f4cb0312..ab6d1f144 100644
--- a/cmd/podman/shared/pod.go
+++ b/cmd/podman/shared/pod.go
@@ -4,6 +4,7 @@ import (
 	"strconv"
 
 	"github.com/containers/libpod/libpod"
+	"github.com/containers/libpod/libpod/define"
 	"github.com/cri-o/ocicni/pkg/ocicni"
 	"github.com/docker/go-connections/nat"
 	"github.com/pkg/errors"
@@ -29,7 +30,7 @@ func GetPodStatus(pod *libpod.Pod) (string, error) {
 	return CreatePodStatusResults(ctrStatuses)
 }
 
-func CreatePodStatusResults(ctrStatuses map[string]libpod.ContainerStatus) (string, error) {
+func CreatePodStatusResults(ctrStatuses map[string]define.ContainerStatus) (string, error) {
 	ctrNum := len(ctrStatuses)
 	if ctrNum == 0 {
 		return PodStateCreated, nil
@@ -43,15 +44,15 @@ func CreatePodStatusResults(ctrStatuses map[string]libpod.ContainerStatus) (stri
 	}
 	for _, ctrStatus := range ctrStatuses {
 		switch ctrStatus {
-		case libpod.ContainerStateExited:
+		case define.ContainerStateExited:
 			fallthrough
-		case libpod.ContainerStateStopped:
+		case define.ContainerStateStopped:
 			statuses[PodStateStopped]++
-		case libpod.ContainerStateRunning:
+		case define.ContainerStateRunning:
 			statuses[PodStateRunning]++
-		case libpod.ContainerStatePaused:
+		case define.ContainerStatePaused:
 			statuses[PodStatePaused]++
-		case libpod.ContainerStateCreated, libpod.ContainerStateConfigured:
+		case define.ContainerStateCreated, define.ContainerStateConfigured:
 			statuses[PodStateCreated]++
 		default:
 			statuses[PodStateErrored]++