summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJhon Honce <jhonce@redhat.com>2020-07-15 08:43:29 -0700
committerJhon Honce <jhonce@redhat.com>2020-07-15 14:20:54 -0700
commit74ca2716a88d32537b90fd2b307a0e8127978e25 (patch)
tree769e7bedbe6d71d71ebaf277bdce2edae6912d9b
parent9efeb1cf290509caa4b0e3c206fe72d194d76a1e (diff)
downloadpodman-74ca2716a88d32537b90fd2b307a0e8127978e25.tar.gz
podman-74ca2716a88d32537b90fd2b307a0e8127978e25.tar.bz2
podman-74ca2716a88d32537b90fd2b307a0e8127978e25.zip
Fix `podman system connection` panic
Signed-off-by: Jhon Honce <jhonce@redhat.com>
-rw-r--r--cmd/podman/system/connection.go3
-rw-r--r--docs/source/markdown/podman-system-connection.1.md6
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`.