5 files changed, 71 insertions, 9 deletions
diff --git a/pkg/adapter/containers.go b/pkg/adapter/containers.go
index bc9554193..0c73977c7 100644
--- a/pkg/adapter/containers.go
+++ b/pkg/adapter/containers.go
@@ -461,7 +461,8 @@ func (r *LocalRuntime) Run(ctx context.Context, c *cliconfig.RunValues, exitCode
 
 	if c.IsSet("rm") {
 		if err := r.Runtime.RemoveContainer(ctx, ctr, false, true); err != nil {
-			if errors.Cause(err) == define.ErrNoSuchCtr {
+			if errors.Cause(err) == define.ErrNoSuchCtr ||
+				errors.Cause(err) == define.ErrCtrRemoved {
 				logrus.Warnf("Container %s does not exist: %v", ctr.ID(), err)
 			} else {
 				logrus.Errorf("Error removing container %s: %v", ctr.ID(), err)
@@ -1009,16 +1010,30 @@ func (r *LocalRuntime) ExecContainer(ctx context.Context, cli *cliconfig.ExecVal
 }
 
 // Prune removes stopped containers
-func (r *LocalRuntime) Prune(ctx context.Context, maxWorkers int, force bool) ([]string, map[string]error, error) {
+func (r *LocalRuntime) Prune(ctx context.Context, maxWorkers int, force bool, filters []string) ([]string, map[string]error, error) {
 	var (
-		ok       = []string{}
-		failures = map[string]error{}
-		err      error
+		ok         = []string{}
+		failures   = map[string]error{}
+		err        error
+		filterFunc []libpod.ContainerFilter
 	)
 
 	logrus.Debugf("Setting maximum rm workers to %d", maxWorkers)
 
-	filter := func(c *libpod.Container) bool {
+	for _, filter := range filters {
+		filterSplit := strings.SplitN(filter, "=", 2)
+		if len(filterSplit) < 2 {
+			return ok, failures, errors.Errorf("filter input must be in the form of filter=value: %s is invalid", filter)
+		}
+
+		f, err := shared.GenerateContainerFilterFuncs(filterSplit[0], filterSplit[1], r.Runtime)
+		if err != nil {
+			return ok, failures, err
+		}
+		filterFunc = append(filterFunc, f)
+	}
+
+	containerStateFilter := func(c *libpod.Container) bool {
 		state, err := c.State()
 		if err != nil {
 			logrus.Error(err)
@@ -1032,7 +1047,9 @@ func (r *LocalRuntime) Prune(ctx context.Context, maxWorkers int, force bool) ([
 		}
 		return false
 	}
-	delContainers, err := r.Runtime.GetContainers(filter)
+	filterFunc = append(filterFunc, containerStateFilter)
+
+	delContainers, err := r.Runtime.GetContainers(filterFunc...)
 	if err != nil {
 		return ok, failures, err
 	}
diff --git a/pkg/adapter/containers_remote.go b/pkg/adapter/containers_remote.go
index e34b8ffd9..36db4af68 100644
--- a/pkg/adapter/containers_remote.go
+++ b/pkg/adapter/containers_remote.go
@@ -922,7 +922,7 @@ func (r *LocalRuntime) Top(cli *cliconfig.TopValues) ([]string, error) {
 }
 
 // Prune removes stopped containers
-func (r *LocalRuntime) Prune(ctx context.Context, maxWorkers int, force bool) ([]string, map[string]error, error) {
+func (r *LocalRuntime) Prune(ctx context.Context, maxWorkers int, force bool, filter []string) ([]string, map[string]error, error) {
 
 	var (
 		ok       = []string{}
diff --git a/pkg/adapter/reset.go b/pkg/adapter/reset.go
new file mode 100644
index 000000000..0decc3d15
--- /dev/null
+++ b/pkg/adapter/reset.go
@@ -0,0 +1,13 @@
+// +build !remoteclient
+
+package adapter
+
+import (
+	"context"
+)
+
+// Reset the container storage back to initial states.
+// Removes all Pods, Containers, Images and Volumes.
+func (r *LocalRuntime) Reset() error {
+	return r.Runtime.Reset(context.TODO())
+}
diff --git a/pkg/adapter/reset_remote.go b/pkg/adapter/reset_remote.go
new file mode 100644
index 000000000..663fab639
--- /dev/null
+++ b/pkg/adapter/reset_remote.go
@@ -0,0 +1,12 @@
+// +build remoteclient
+
+package adapter
+
+import (
+	"github.com/containers/libpod/cmd/podman/varlink"
+)
+
+// Info returns information for the host system and its components
+func (r RemoteRuntime) Reset() error {
+	return iopodman.Reset().Call(r.Conn)
+}
diff --git a/pkg/varlinkapi/system.go b/pkg/varlinkapi/system.go
index f6057f5fc..b81ff11ba 100644
--- a/pkg/varlinkapi/system.go
+++ b/pkg/varlinkapi/system.go
@@ -3,12 +3,15 @@
 package varlinkapi
 
 import (
+	"context"
 	"fmt"
-	"github.com/containers/libpod/libpod/define"
+	"os"
 	goruntime "runtime"
 	"time"
 
 	"github.com/containers/libpod/cmd/podman/varlink"
+	"github.com/containers/libpod/libpod/define"
+	"github.com/sirupsen/logrus"
 )
 
 // GetVersion ...
@@ -105,3 +108,20 @@ func (i *LibpodAPI) GetInfo(call iopodman.VarlinkCall) error {
 	podmanInfo.Insecure_registries = insecureRegistries
 	return call.ReplyGetInfo(podmanInfo)
 }
+
+// GetVersion ...
+func (i *LibpodAPI) Reset(call iopodman.VarlinkCall) error {
+	if err := i.Runtime.Reset(context.TODO()); err != nil {
+		logrus.Errorf("Reset Failed: %v", err)
+		if err := call.ReplyErrorOccurred(err.Error()); err != nil {
+			logrus.Errorf("Failed to send ReplyErrorOccurred: %v", err)
+		}
+		os.Exit(define.ExecErrorCodeGeneric)
+	}
+	if err := call.ReplyReset(); err != nil {
+		logrus.Errorf("Failed to send ReplyReset: %v", err)
+		os.Exit(define.ExecErrorCodeGeneric)
+	}
+	os.Exit(0)
+	return nil
+}