diff options
| author | Ashley Cui <acui@redhat.com> | 2021-09-03 14:15:32 -0400 |
|---|---|---|
| committer | Matthew Heon <mheon@redhat.com> | 2021-09-16 09:42:14 -0400 |
| commit | 5829d62ea0c08e358eb287636673316080d51001 (patch) | |
| tree | 2e9ea774211f48d5f9d50bfbd046fea38fbe60db /pkg | |
| parent | c487389fa501556fdeafdff7f484c96acd616557 (diff) | |
| download | podman-5829d62ea0c08e358eb287636673316080d51001.tar.gz podman-5829d62ea0c08e358eb287636673316080d51001.tar.bz2 podman-5829d62ea0c08e358eb287636673316080d51001.zip | |
Use default username for podman machine ssh
When using the defaut conection for podman machine ssh, use the default
username too.
Signed-off-by: Ashley Cui <acui@redhat.com>
Diffstat (limited to 'pkg')
| -rw-r--r-- | pkg/machine/config.go | 3 | ||||
| -rw-r--r-- | pkg/machine/qemu/machine.go | 7 |
2 files changed, 8 insertions, 2 deletions
diff --git a/pkg/machine/config.go b/pkg/machine/config.go index cad71ba49..8db2335aa 100644 --- a/pkg/machine/config.go +++ b/pkg/machine/config.go @@ -61,7 +61,8 @@ type ListResponse struct { } type SSHOptions struct { - Args []string + Username string + Args []string } type StartOptions struct{} diff --git a/pkg/machine/qemu/machine.go b/pkg/machine/qemu/machine.go index 855a39c56..5d8c6e6ce 100644 --- a/pkg/machine/qemu/machine.go +++ b/pkg/machine/qemu/machine.go @@ -488,7 +488,12 @@ func (v *MachineVM) SSH(name string, opts machine.SSHOptions) error { return errors.Errorf("vm %q is not running.", v.Name) } - sshDestination := v.RemoteUsername + "@localhost" + username := opts.Username + if username == "" { + username = v.RemoteUsername + } + + sshDestination := username + "@localhost" port := strconv.Itoa(v.Port) args := []string{"-i", v.IdentityPath, "-p", port, sshDestination, "-o", "UserKnownHostsFile /dev/null", "-o", "StrictHostKeyChecking no"} |