Merge pull request containers#6988 from jwhonce/wip/connection

Fix `podman system connection` panic
mheon · Jul 16, 2020 · f4766e0 · f4766e0
2 parents ad388b9 + 74ca271
commit f4766e0
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 1 deletion.
diff --git a/cmd/podman/system/connection.go b/cmd/podman/system/connection.go
@@ -60,7 +60,8 @@ func init() {
 	})
 
 	flags := connectionCmd.Flags()
-	flags.IntVarP(&cOpts.Port, "port", "p", 22, "port number for destination")
+	flags.IntVarP(&cOpts.Port, "port", "p", 22, "SSH port number for destination")
+	flags.StringVar(&cOpts.Identity, "identity", "", "path to SSH identity file")
 	flags.StringVar(&cOpts.UDSPath, "socket-path", "", "path to podman socket on remote host. (default '/run/podman/podman.sock' or '/run/user/{uid}/podman/podman.sock)")
 }
 

diff --git a/docs/source/markdown/podman-system-connection.1.md b/docs/source/markdown/podman-system-connection.1.md
@@ -15,6 +15,12 @@ The user will be prompted for the remote ssh login password or key file pass phr
 
 ## OPTIONS
 
+**--identity**=*path*
+
+Path to ssh identity file. If the identity file has been encrypted, Podman prompts the user for the passphrase.
+If no identity file is provided and no user is given, Podman defaults to the user running the podman command.
+Podman prompts for the login password on the remote server.
+
 **-p**, **--port**=*port*
 
 Port for ssh destination. The default value is `22`.