3 files changed, 45 insertions, 5 deletions
diff --git a/pkg/domain/infra/abi/system.go b/pkg/domain/infra/abi/system.go
index 52dfaba7d..9b538b301 100644
--- a/pkg/domain/infra/abi/system.go
+++ b/pkg/domain/infra/abi/system.go
@@ -25,7 +25,38 @@ import (
 )
 
 func (ic *ContainerEngine) Info(ctx context.Context) (*define.Info, error) {
-	return ic.Libpod.Info()
+	info, err := ic.Libpod.Info()
+	if err != nil {
+		return nil, err
+	}
+	xdg, err := util.GetRuntimeDir()
+	if err != nil {
+		return nil, err
+	}
+	if len(xdg) == 0 {
+		// If no xdg is returned, assume root socket
+		xdg = "/run"
+	}
+
+	// Glue the socket path together
+	socketPath := filepath.Join(xdg, "podman", "podman.sock")
+	rs := define.RemoteSocket{
+		Path:   socketPath,
+		Exists: false,
+	}
+
+	// Check if the socket exists
+	if fi, err := os.Stat(socketPath); err == nil {
+		if fi.Mode()&os.ModeSocket != 0 {
+			rs.Exists = true
+		}
+	}
+	// TODO
+	// it was suggested future versions of this could perform
+	// a ping on the socket for greater confidence the socket is
+	// actually active.
+	info.Host.RemoteSocket = &rs
+	return info, err
 }
 
 func (ic *ContainerEngine) SetupRootless(_ context.Context, cmd *cobra.Command) error {
diff --git a/pkg/domain/infra/tunnel/containers.go b/pkg/domain/infra/tunnel/containers.go
index 97b98eec2..36b7bf535 100644
--- a/pkg/domain/infra/tunnel/containers.go
+++ b/pkg/domain/infra/tunnel/containers.go
@@ -86,8 +86,16 @@ func (ic *ContainerEngine) ContainerStop(ctx context.Context, namesOrIds []strin
 	var (
 		reports []*entities.StopReport
 	)
+	for _, cidFile := range options.CIDFiles {
+		content, err := ioutil.ReadFile(cidFile)
+		if err != nil {
+			return nil, errors.Wrapf(err, "error reading CIDFile %s", cidFile)
+		}
+		id := strings.Split(string(content), "\n")[0]
+		namesOrIds = append(namesOrIds, id)
+	}
 	ctrs, err := getContainersByContext(ic.ClientCxt, options.All, namesOrIds)
-	if err != nil {
+	if err != nil && !(options.Ignore && errors.Cause(err) == define.ErrNoSuchCtr) {
 		return nil, err
 	}
 	for _, c := range ctrs {
@@ -172,7 +180,7 @@ func (ic *ContainerEngine) ContainerRm(ctx context.Context, namesOrIds []string,
 		namesOrIds = append(namesOrIds, id)
 	}
 	ctrs, err := getContainersByContext(ic.ClientCxt, options.All, namesOrIds)
-	if err != nil {
+	if err != nil && !(options.Ignore && errors.Cause(err) == define.ErrNoSuchCtr) {
 		return nil, err
 	}
 	// TODO there is no endpoint for container eviction.  Need to discuss
diff --git a/pkg/domain/infra/tunnel/pods.go b/pkg/domain/infra/tunnel/pods.go
index c193c6752..b93c48aab 100644
--- a/pkg/domain/infra/tunnel/pods.go
+++ b/pkg/domain/infra/tunnel/pods.go
@@ -3,6 +3,7 @@ package tunnel
 import (
 	"context"
 
+	"github.com/containers/libpod/libpod/define"
 	"github.com/containers/libpod/pkg/bindings/pods"
 	"github.com/containers/libpod/pkg/domain/entities"
 	"github.com/containers/libpod/pkg/specgen"
@@ -89,7 +90,7 @@ func (ic *ContainerEngine) PodStop(ctx context.Context, namesOrIds []string, opt
 		timeout int = -1
 	)
 	foundPods, err := getPodsByContext(ic.ClientCxt, options.All, namesOrIds)
-	if err != nil {
+	if err != nil && !(options.Ignore && errors.Cause(err) == define.ErrNoSuchPod) {
 		return nil, err
 	}
 	if options.Timeout != -1 {
@@ -155,7 +156,7 @@ func (ic *ContainerEngine) PodStart(ctx context.Context, namesOrIds []string, op
 func (ic *ContainerEngine) PodRm(ctx context.Context, namesOrIds []string, options entities.PodRmOptions) ([]*entities.PodRmReport, error) {
 	var reports []*entities.PodRmReport
 	foundPods, err := getPodsByContext(ic.ClientCxt, options.All, namesOrIds)
-	if err != nil {
+	if err != nil && !(options.Ignore && errors.Cause(err) == define.ErrNoSuchPod) {
 		return nil, err
 	}
 	for _, p := range foundPods {