5 files changed, 25 insertions, 14 deletions
diff --git a/cmd/podman/system/df.go b/cmd/podman/system/df.go
index 7caa8e39a..8fe035209 100644
--- a/cmd/podman/system/df.go
+++ b/cmd/podman/system/df.go
@@ -37,7 +37,7 @@ var (
 
 func init() {
 	registry.Commands = append(registry.Commands, registry.CliCommand{
-		Mode:    []entities.EngineMode{entities.ABIMode},
+		Mode:    []entities.EngineMode{entities.ABIMode, entities.TunnelMode},
 		Command: dfSystemCommand,
 		Parent:  systemCmd,
 	})
diff --git a/cmd/podman/system/events.go b/cmd/podman/system/events.go
index 6aae62dc0..27e80138e 100644
--- a/cmd/podman/system/events.go
+++ b/cmd/podman/system/events.go
@@ -5,6 +5,7 @@ import (
 	"context"
 	"html/template"
 	"os"
+	"strings"
 
 	"github.com/containers/buildah/pkg/formats"
 	"github.com/containers/libpod/cmd/podman/registry"
@@ -54,6 +55,9 @@ func eventsCmd(cmd *cobra.Command, args []string) error {
 		eventsError error
 		tmpl        *template.Template
 	)
+	if strings.Join(strings.Fields(eventFormat), "") == "{{json.}}" {
+		eventFormat = formats.JSONString
+	}
 	if eventFormat != formats.JSONString {
 		tmpl, err = template.New("events").Parse(eventFormat)
 		if err != nil {
diff --git a/cmd/podman/system/reset.go b/cmd/podman/system/reset.go
index 22ddc7529..6caa91690 100644
--- a/cmd/podman/system/reset.go
+++ b/cmd/podman/system/reset.go
@@ -26,10 +26,8 @@ var (
 		Long:  systemResetDescription,
 		Run:   reset,
 	}
-)
 
-var (
-	systemResetOptions entities.SystemResetOptions
+	forceFlag bool
 )
 
 func init() {
@@ -39,12 +37,12 @@ func init() {
 		Parent:  systemCmd,
 	})
 	flags := systemResetCommand.Flags()
-	flags.BoolVarP(&systemResetOptions.Force, "force", "f", false, "Do not prompt for confirmation")
+	flags.BoolVarP(&forceFlag, "force", "f", false, "Do not prompt for confirmation")
 }
 
 func reset(cmd *cobra.Command, args []string) {
 	// Prompt for confirmation if --force is not set
-	if !systemResetOptions.Force {
+	if !forceFlag {
 		reader := bufio.NewReader(os.Stdin)
 		fmt.Print(`
 WARNING! This will remove:
@@ -74,7 +72,7 @@ Are you sure you want to continue? [y/N] `)
 	}
 	defer engine.Shutdown(registry.Context())
 
-	if err := engine.Reset(registry.Context(), systemResetOptions); err != nil {
+	if err := engine.Reset(registry.Context()); err != nil {
 		fmt.Println(err)
 		os.Exit(125)
 	}
diff --git a/cmd/podman/system/service.go b/cmd/podman/system/service.go
index 552c72f79..b5dd2f2aa 100644
--- a/cmd/podman/system/service.go
+++ b/cmd/podman/system/service.go
@@ -1,3 +1,5 @@
+// +build linux
+
 package system
 
 import (
diff --git a/cmd/podman/system/version.go b/cmd/podman/system/version.go
index 50bd81368..92a3225b6 100644
--- a/cmd/podman/system/version.go
+++ b/cmd/podman/system/version.go
@@ -6,8 +6,8 @@ import (
 	"os"
 	"strings"
 	"text/tabwriter"
-	"time"
 
+	"github.com/containers/buildah/pkg/formats"
 	"github.com/containers/libpod/cmd/podman/registry"
 	"github.com/containers/libpod/cmd/podman/validate"
 	"github.com/containers/libpod/libpod/define"
@@ -52,6 +52,17 @@ func version(cmd *cobra.Command, args []string) error {
 		if !strings.HasSuffix(versionFormat, "\n") {
 			versionFormat += "\n"
 		}
+		out := formats.StdoutTemplate{Output: versions, Template: versionFormat}
+		err := out.Out()
+		if err != nil {
+			// On Failure, assume user is using older version of podman version --format and check client
+			versionFormat = strings.Replace(versionFormat, ".Server.", ".", 1)
+			out = formats.StdoutTemplate{Output: versions.Client, Template: versionFormat}
+			if err1 := out.Out(); err1 != nil {
+				return err
+			}
+		}
+		return nil
 	}
 
 	w := tabwriter.NewWriter(os.Stdout, 0, 0, 2, ' ', 0)
@@ -74,15 +85,11 @@ func version(cmd *cobra.Command, args []string) error {
 
 func formatVersion(writer io.Writer, version *define.Version) {
 	fmt.Fprintf(writer, "Version:\t%s\n", version.Version)
-	fmt.Fprintf(writer, "RemoteAPI Version:\t%d\n", version.RemoteAPIVersion)
+	fmt.Fprintf(writer, "API Version:\t%d\n", version.APIVersion)
 	fmt.Fprintf(writer, "Go Version:\t%s\n", version.GoVersion)
 	if version.GitCommit != "" {
 		fmt.Fprintf(writer, "Git Commit:\t%s\n", version.GitCommit)
 	}
-	// Prints out the build time in readable format
-	if version.Built != 0 {
-		fmt.Fprintf(writer, "Built:\t%s\n", time.Unix(version.Built, 0).Format(time.ANSIC))
-	}
-
+	fmt.Fprintf(writer, "Built:\t%s\n", version.BuiltTime)
 	fmt.Fprintf(writer, "OS/Arch:\t%s\n", version.OsArch)
 }