3 files changed, 35 insertions, 5 deletions
diff --git a/cmd/podman/cliconfig/config.go b/cmd/podman/cliconfig/config.go
index b8b1648b8..545166d05 100644
--- a/cmd/podman/cliconfig/config.go
+++ b/cmd/podman/cliconfig/config.go
@@ -145,7 +145,8 @@ type ExportValues struct {
 }
 type GenerateKubeValues struct {
 	PodmanCommand
-	Service bool
+	Service  bool
+	Filename string
 }
 
 type GenerateSystemdValues struct {
diff --git a/cmd/podman/generate_kube.go b/cmd/podman/generate_kube.go
index 318dd0771..3969e3132 100644
--- a/cmd/podman/generate_kube.go
+++ b/cmd/podman/generate_kube.go
@@ -2,6 +2,9 @@ package main
 
 import (
 	"fmt"
+	"io/ioutil"
+	"os"
+
 	"github.com/containers/libpod/cmd/podman/cliconfig"
 	"github.com/containers/libpod/pkg/adapter"
 	podmanVersion "github.com/containers/libpod/version"
@@ -37,6 +40,7 @@ func init() {
 	containerKubeCommand.SetUsageTemplate(UsageTemplate())
 	flags := containerKubeCommand.Flags()
 	flags.BoolVarP(&containerKubeCommand.Service, "service", "s", false, "Generate YAML for kubernetes service object")
+	flags.StringVarP(&containerKubeCommand.Filename, "filename", "f", "", "Filename to output to")
 }
 
 func generateKubeYAMLCmd(c *cliconfig.GenerateKubeValues) error {
@@ -88,8 +92,19 @@ func generateKubeYAMLCmd(c *cliconfig.GenerateKubeValues) error {
 		output = append(output, []byte("---\n")...)
 		output = append(output, marshalledService...)
 	}
-	// Output the v1.Pod with the v1.Container
-	fmt.Println(string(output))
+
+	if c.Filename != "" {
+		if _, err := os.Stat(c.Filename); err == nil {
+			return errors.Errorf("cannot write to %q - file exists", c.Filename)
+		}
+
+		if err := ioutil.WriteFile(c.Filename, output, 0644); err != nil {
+			return err
+		}
+	} else {
+		// Output the v1.Pod with the v1.Container
+		fmt.Println(string(output))
+	}
 
 	return nil
 }
diff --git a/cmd/podman/restore.go b/cmd/podman/restore.go
index 9c77d4a5e..6e445e5df 100644
--- a/cmd/podman/restore.go
+++ b/cmd/podman/restore.go
@@ -76,8 +76,22 @@ func restoreCmd(c *cliconfig.RestoreValues, cmd *cobra.Command) error {
 		return errors.Errorf("--tcp-established cannot be used with --name")
 	}
 
-	if (c.Import != "") && (c.All || c.Latest) {
-		return errors.Errorf("Cannot use --import and --all or --latest at the same time")
+	argLen := len(c.InputArgs)
+	if c.Import != "" {
+		if c.All || c.Latest {
+			return errors.Errorf("Cannot use --import with --all or --latest")
+		}
+		if argLen > 0 {
+			return errors.Errorf("Cannot use --import with positional arguments")
+		}
 	}
+
+	if (c.All || c.Latest) && argLen > 0 {
+		return errors.Errorf("no arguments are needed with --all or --latest")
+	}
+	if argLen < 1 && !c.All && !c.Latest && c.Import == "" {
+		return errors.Errorf("you must provide at least one name or id")
+	}
+
 	return runtime.Restore(getContext(), c, options)
 }