3 files changed, 46 insertions, 1 deletions
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
+}