7 files changed, 28 insertions, 34 deletions
diff --git a/cmd/podman/containers/create.go b/cmd/podman/containers/create.go
index c8007bc2f..ed09585ba 100644
--- a/cmd/podman/containers/create.go
+++ b/cmd/podman/containers/create.go
@@ -161,24 +161,25 @@ func createInit(c *cobra.Command) error {
 	if c.Flag("no-hosts").Changed && c.Flag("add-host").Changed {
 		return errors.Errorf("--no-hosts and --add-host cannot be set together")
 	}
-	if c.Flag("userns").Changed {
-		cliVals.UserNS = c.Flag("userns").Value.String()
-	}
-	if c.Flag("ipc").Changed {
-		cliVals.IPC = c.Flag("ipc").Value.String()
-	}
-	if c.Flag("uts").Changed {
-		cliVals.UTS = c.Flag("uts").Value.String()
-	}
-	if c.Flag("pid").Changed {
-		cliVals.PID = c.Flag("pid").Value.String()
+	cliVals.UserNS = c.Flag("userns").Value.String()
+	// if user did not modify --userns flag and did turn on
+	// uid/gid mappsings, set userns flag to "private"
+	if !c.Flag("userns").Changed && cliVals.UserNS == "host" {
+		if len(cliVals.UIDMap) > 0 ||
+			len(cliVals.GIDMap) > 0 ||
+			cliVals.SubUIDName != "" ||
+			cliVals.SubGIDName != "" {
+			cliVals.UserNS = "private"
+		}
 	}
+
+	cliVals.IPC = c.Flag("ipc").Value.String()
+	cliVals.UTS = c.Flag("uts").Value.String()
+	cliVals.PID = c.Flag("pid").Value.String()
+	cliVals.CGroupsNS = c.Flag("cgroupns").Value.String()
 	if !c.Flag("pids-limit").Changed {
 		cliVals.PIDsLimit = -1
 	}
-	if c.Flag("cgroupns").Changed {
-		cliVals.CGroupsNS = c.Flag("cgroupns").Value.String()
-	}
 	if c.Flag("entrypoint").Changed {
 		val := c.Flag("entrypoint").Value.String()
 		cliVals.Entrypoint = &val
diff --git a/cmd/podman/containers/inspect.go b/cmd/podman/containers/inspect.go
index 4549a4ef6..8556ebe83 100644
--- a/cmd/podman/containers/inspect.go
+++ b/cmd/podman/containers/inspect.go
@@ -26,9 +26,15 @@ func init() {
 		Command: inspectCmd,
 		Parent:  containerCmd,
 	})
-	inspectOpts = inspect.AddInspectFlagSet(inspectCmd)
+	inspectOpts = new(entities.InspectOptions)
+	flags := inspectCmd.Flags()
+	flags.BoolVarP(&inspectOpts.Size, "size", "s", false, "Display total file size")
+	flags.StringVarP(&inspectOpts.Format, "format", "f", "json", "Format the output to a Go template or json")
+	flags.BoolVarP(&inspectOpts.Latest, "latest", "l", false, "Act on the latest container Podman is aware of")
 }
 
 func inspectExec(cmd *cobra.Command, args []string) error {
+	// Force container type
+	inspectOpts.Type = inspect.ContainerType
 	return inspect.Inspect(args, *inspectOpts)
 }
diff --git a/cmd/podman/images/inspect.go b/cmd/podman/images/inspect.go
index 8c727eb07..f6a10ba44 100644
--- a/cmd/podman/images/inspect.go
+++ b/cmd/podman/images/inspect.go
@@ -27,11 +27,12 @@ func init() {
 		Command: inspectCmd,
 		Parent:  imageCmd,
 	})
-	inspectOpts = inspect.AddInspectFlagSet(inspectCmd)
+	inspectOpts = new(entities.InspectOptions)
 	flags := inspectCmd.Flags()
-	_ = flags.MarkHidden("latest") // Shared with container-inspect but not wanted here.
+	flags.StringVarP(&inspectOpts.Format, "format", "f", "json", "Format the output to a Go template or json")
 }
 
 func inspectExec(cmd *cobra.Command, args []string) error {
+	inspectOpts.Type = inspect.ImageType
 	return inspect.Inspect(args, *inspectOpts)
 }
diff --git a/cmd/podman/registry/config_abi.go b/cmd/podman/registry/config_abi.go
index 55430e1bf..4a909c17e 100644
--- a/cmd/podman/registry/config_abi.go
+++ b/cmd/podman/registry/config_abi.go
@@ -1,4 +1,4 @@
-// +build ABISupport
+// +build !remote
 
 package registry
 
diff --git a/cmd/podman/registry/config_tunnel.go b/cmd/podman/registry/config_tunnel.go
index 29e744dac..bb3da947e 100644
--- a/cmd/podman/registry/config_tunnel.go
+++ b/cmd/podman/registry/config_tunnel.go
@@ -1,4 +1,4 @@
-// +build !ABISupport
+// +build remote
 
 package registry
 
diff --git a/cmd/podman/system/service_abi.go b/cmd/podman/system/service_abi.go
index 501650839..f5386c4f1 100644
--- a/cmd/podman/system/service_abi.go
+++ b/cmd/podman/system/service_abi.go
@@ -1,4 +1,4 @@
-// +build ABISupport,!remote
+// +build linux,!remote
 
 package system
 
diff --git a/cmd/podman/system/service_unsupported.go b/cmd/podman/system/service_unsupported.go
deleted file mode 100644
index 82272c882..000000000
--- a/cmd/podman/system/service_unsupported.go
+++ /dev/null
@@ -1,14 +0,0 @@
-// +build !ABISupport,!remote
-
-package system
-
-import (
-	"errors"
-
-	"github.com/containers/libpod/pkg/domain/entities"
-	"github.com/spf13/pflag"
-)
-
-func restService(opts entities.ServiceOptions, flags *pflag.FlagSet, cfg *entities.PodmanConfig) error {
-	return errors.New("not supported")
-}