2 files changed, 19 insertions, 3 deletions
diff --git a/cmd/podman/containers/cp.go b/cmd/podman/containers/cp.go
index d3b904412..7887e9539 100644
--- a/cmd/podman/containers/cp.go
+++ b/cmd/podman/containers/cp.go
@@ -121,7 +121,9 @@ func copyFromContainer(container string, containerPath string, hostPath string)
 		return err
 	}
 
+	isStdout := false
 	if hostPath == "-" {
+		isStdout = true
 		hostPath = os.Stdout.Name()
 	}
 
@@ -152,10 +154,16 @@ func copyFromContainer(container string, containerPath string, hostPath string)
 		hostBaseName = filepath.Base(hostInfo.LinkTarget)
 	}
 
+	if !isStdout {
+		if err := validateFileInfo(hostInfo); err != nil {
+			return errors.Wrap(err, "invalid destination")
+		}
+	}
+
 	reader, writer := io.Pipe()
 	hostCopy := func() error {
 		defer reader.Close()
-		if hostInfo.LinkTarget == os.Stdout.Name() {
+		if isStdout {
 			_, err := io.Copy(os.Stdout, reader)
 			return err
 		}
@@ -223,8 +231,6 @@ func copyToContainer(container string, containerPath string, hostPath string) er
 	if hostPath == "-" {
 		hostPath = os.Stdin.Name()
 		isStdin = true
-	} else if hostPath == os.Stdin.Name() {
-		isStdin = true
 	}
 
 	// Make sure that host path exists.
@@ -363,3 +369,12 @@ func containerParentDir(container string, containerPath string) (string, error)
 	workDir = filepath.Join(workDir, containerPath)
 	return filepath.Dir(workDir), nil
 }
+
+// validateFileInfo returns an error if the specified FileInfo doesn't point to
+// a directory or a regular file.
+func validateFileInfo(info *copy.FileInfo) error {
+	if info.Mode.IsDir() || info.Mode.IsRegular() {
+		return nil
+	}
+	return errors.Errorf("%q must be a directory or a regular file", info.LinkTarget)
+}
diff --git a/cmd/podman/generate/systemd.go b/cmd/podman/generate/systemd.go
index 913b0c7ed..693506725 100644
--- a/cmd/podman/generate/systemd.go
+++ b/cmd/podman/generate/systemd.go
@@ -52,6 +52,7 @@ func init() {
 	flags.UintVarP(&systemdTimeout, timeFlagName, "t", containerConfig.Engine.StopTimeout, "Stop timeout override")
 	_ = systemdCmd.RegisterFlagCompletionFunc(timeFlagName, completion.AutocompleteNone)
 	flags.BoolVarP(&systemdOptions.New, "new", "", false, "Create a new container instead of starting an existing one")
+	flags.BoolVarP(&systemdOptions.NoHeader, "no-header", "", false, "Skip header generation")
 
 	containerPrefixFlagName := "container-prefix"
 	flags.StringVar(&systemdOptions.ContainerPrefix, containerPrefixFlagName, "container", "Systemd unit name prefix for containers")