diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2021-03-28 10:55:45 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-03-28 10:55:45 +0000 |
| commit | b2e7a3e45c89132e41b0d864dbc4eacacbecf08d (patch) | |
| tree | f990f0b9b079cecce73f0730ffc2c6a1fe2bec82 /cmd/podman/machine/ssh.go | |
| parent | 4831d4134606699615454caa1ee75e7d37ee778b (diff) | |
| parent | 7a79f708a4521ba7c42da83a204a01ace010ace3 (diff) | |
| download | podman-b2e7a3e45c89132e41b0d864dbc4eacacbecf08d.tar.gz podman-b2e7a3e45c89132e41b0d864dbc4eacacbecf08d.tar.bz2 podman-b2e7a3e45c89132e41b0d864dbc4eacacbecf08d.zip | |
Merge pull request #9836 from baude/vmcreateresize
Podman machine enhancements
Diffstat (limited to 'cmd/podman/machine/ssh.go')
| -rw-r--r-- | cmd/podman/machine/ssh.go | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/cmd/podman/machine/ssh.go b/cmd/podman/machine/ssh.go index a7111a195..879122a14 100644 --- a/cmd/podman/machine/ssh.go +++ b/cmd/podman/machine/ssh.go @@ -14,11 +14,11 @@ import ( var ( sshCmd = &cobra.Command{ - Use: "ssh [options] NAME [COMMAND [ARG ...]]", + Use: "ssh [options] [NAME] [COMMAND [ARG ...]]", Short: "SSH into a virtual machine", Long: "SSH into a virtual machine ", RunE: ssh, - Args: cobra.MinimumNArgs(1), + Args: cobra.MaximumNArgs(1), Example: `podman machine ssh myvm podman machine ssh -e myvm echo hello`, @@ -48,6 +48,10 @@ func ssh(cmd *cobra.Command, args []string) error { vm machine.VM vmType string ) + vmName := defaultMachineName + if len(args) > 0 && len(args[0]) > 1 { + vmName = args[0] + } sshOpts.Args = args[1:] // Error if no execute but args given @@ -61,10 +65,10 @@ func ssh(cmd *cobra.Command, args []string) error { switch vmType { default: - vm, err = qemu.LoadVMByName(args[0]) + vm, err = qemu.LoadVMByName(vmName) } if err != nil { return errors.Wrapf(err, "vm %s not found", args[0]) } - return vm.SSH(args[0], sshOpts) + return vm.SSH(vmName, sshOpts) } |