4 files changed, 31 insertions, 12 deletions
diff --git a/cmd/podman/images/list.go b/cmd/podman/images/list.go
index 043871a8c..ffb341fc4 100644
--- a/cmd/podman/images/list.go
+++ b/cmd/podman/images/list.go
@@ -184,13 +184,26 @@ func sortImages(imageS []*entities.ImageSummary) ([]imageReporter, error) {
 	for _, e := range imageS {
 		var h imageReporter
 		if len(e.RepoTags) > 0 {
+			tagged := []imageReporter{}
+			untagged := []imageReporter{}
 			for _, tag := range e.RepoTags {
 				h.ImageSummary = *e
 				h.Repository, h.Tag, err = tokenRepoTag(tag)
 				if err != nil {
 					return nil, errors.Wrapf(err, "error parsing repository tag %q:", tag)
 				}
-				imgs = append(imgs, h)
+				if h.Tag == "<none>" {
+					untagged = append(untagged, h)
+				} else {
+					tagged = append(tagged, h)
+				}
+			}
+			// Note: we only want to display "<none>" if we
+			// couldn't find any tagged name in RepoTags.
+			if len(tagged) > 0 {
+				imgs = append(imgs, tagged...)
+			} else {
+				imgs = append(imgs, untagged[0])
 			}
 		} else {
 			h.ImageSummary = *e
diff --git a/cmd/podman/pods/create.go b/cmd/podman/pods/create.go
index 603ddcaca..d8d32b930 100644
--- a/cmd/podman/pods/create.go
+++ b/cmd/podman/pods/create.go
@@ -55,8 +55,8 @@ func init() {
 	flags.StringVar(&createOptions.CGroupParent, "cgroup-parent", "", "Set parent cgroup for the pod")
 	flags.BoolVar(&createOptions.Infra, "infra", true, "Create an infra container associated with the pod to share namespaces with")
 	flags.StringVar(&createOptions.InfraConmonPidFile, "infra-conmon-pidfile", "", "Path to the file that will receive the POD of the infra container's conmon")
-	flags.StringVar(&createOptions.InfraImage, "infra-image", containerConfig.Engine.InfraImage, "The image of the infra container to associate with the pod")
-	flags.StringVar(&createOptions.InfraCommand, "infra-command", containerConfig.Engine.InfraCommand, "The command to run on the infra container when the pod is started")
+	flags.String("infra-image", containerConfig.Engine.InfraImage, "The image of the infra container to associate with the pod")
+	flags.String("infra-command", containerConfig.Engine.InfraCommand, "The command to run on the infra container when the pod is started")
 	flags.StringSliceVar(&labelFile, "label-file", []string{}, "Read in a line delimited file of labels")
 	flags.StringSliceVarP(&labels, "label", "l", []string{}, "Set metadata on pod (default [])")
 	flags.StringVarP(&createOptions.Name, "name", "n", "", "Assign a name to the pod")
@@ -92,7 +92,6 @@ func create(cmd *cobra.Command, args []string) error {
 		if cmd.Flag("infra-command").Changed {
 			return errors.New("cannot set infra-command without an infra container")
 		}
-		createOptions.InfraCommand = ""
 		if cmd.Flag("infra-image").Changed {
 			return errors.New("cannot set infra-image without an infra container")
 		}
@@ -104,6 +103,20 @@ func create(cmd *cobra.Command, args []string) error {
 		createOptions.Share = nil
 	} else {
 		createOptions.Share = strings.Split(share, ",")
+		if cmd.Flag("infra-command").Changed {
+			// Only send content to server side if user changed defaults
+			createOptions.InfraCommand, err = cmd.Flags().GetString("infra-command")
+			if err != nil {
+				return err
+			}
+		}
+		if cmd.Flag("infra-image").Changed {
+			// Only send content to server side if user changed defaults
+			createOptions.InfraImage, err = cmd.Flags().GetString("infra-image")
+			if err != nil {
+				return err
+			}
+		}
 	}
 
 	if cmd.Flag("pod-id-file").Changed {
diff --git a/cmd/podman/root.go b/cmd/podman/root.go
index d079018a0..8def7112f 100644
--- a/cmd/podman/root.go
+++ b/cmd/podman/root.go
@@ -80,10 +80,6 @@ func init() {
 	)
 
 	rootFlags(rootCmd, registry.PodmanConfig())
-
-	// "version" is a local flag to avoid collisions with sub-commands that use "-v"
-	var dummyVersion bool
-	rootCmd.Flags().BoolVarP(&dummyVersion, "version", "v", false, "Version of Podman")
 }
 
 func Execute() {
diff --git a/cmd/podman/system/version.go b/cmd/podman/system/version.go
index edc860d0e..5f39b4820 100644
--- a/cmd/podman/system/version.go
+++ b/cmd/podman/system/version.go
@@ -47,12 +47,9 @@ func version(cmd *cobra.Command, args []string) error {
 		if err != nil {
 			return err
 		}
-		_, err = io.WriteString(os.Stdout, s)
+		_, err = io.WriteString(os.Stdout, s+"\n")
 		return err
 	case cmd.Flag("format").Changed:
-		if !strings.HasSuffix(versionFormat, "\n") {
-			versionFormat += "\n"
-		}
 		out := formats.StdoutTemplate{Output: versions, Template: versionFormat}
 		err := out.Out()
 		if err != nil {