diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2020-07-16 11:16:47 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-07-16 11:16:47 -0400 |
| commit | f4766e01e3b314543d131577d0ef891670b81a84 (patch) | |
| tree | 08b0e4ad43c5a7b96dacc23eb54d7588f4eaae20 | |
| parent | ad388b9b5427811976e2f38089580673442067f3 (diff) | |
| parent | 74ca2716a88d32537b90fd2b307a0e8127978e25 (diff) | |
| download | podman-f4766e01e3b314543d131577d0ef891670b81a84.tar.gz podman-f4766e01e3b314543d131577d0ef891670b81a84.tar.bz2 podman-f4766e01e3b314543d131577d0ef891670b81a84.zip | |
Merge pull request #6988 from jwhonce/wip/connection
Fix `podman system connection` panic
| -rw-r--r-- | cmd/podman/system/connection.go | 3 | ||||
| -rw-r--r-- | docs/source/markdown/podman-system-connection.1.md | 6 |
2 files changed, 8 insertions, 1 deletions
diff --git a/cmd/podman/system/connection.go b/cmd/podman/system/connection.go index 6a55d2d79..9f26a0df6 100644 --- 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 index ed73980d6..66cb656ae 100644 --- 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`. |