Skip to content

Commit 8f0b3eb

Browse files
committed
Revert "pkg/driver/qemu: Wait for SSH to be ready in AdditionalSetupForSSH()"
This reverts commit 5fde2e3. Signed-off-by: Norio Nomura <[email protected]>
1 parent 5a52082 commit 8f0b3eb

File tree

1 file changed

+1
-18
lines changed

1 file changed

+1
-18
lines changed

pkg/driver/qemu/qemu_driver.go

Lines changed: 1 addition & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -31,14 +31,12 @@ import (
3131
"github.com/lima-vm/lima/v2/pkg/driver/qemu/entitlementutil"
3232
"github.com/lima-vm/lima/v2/pkg/executil"
3333
"github.com/lima-vm/lima/v2/pkg/limatype"
34-
"github.com/lima-vm/lima/v2/pkg/limatype/dirnames"
3534
"github.com/lima-vm/lima/v2/pkg/limatype/filenames"
3635
"github.com/lima-vm/lima/v2/pkg/limayaml"
3736
"github.com/lima-vm/lima/v2/pkg/networks/usernet"
3837
"github.com/lima-vm/lima/v2/pkg/osutil"
3938
"github.com/lima-vm/lima/v2/pkg/ptr"
4039
"github.com/lima-vm/lima/v2/pkg/reflectutil"
41-
"github.com/lima-vm/lima/v2/pkg/sshutil"
4240
"github.com/lima-vm/lima/v2/pkg/version/versionutil"
4341
)
4442

@@ -723,21 +721,6 @@ func (l *LimaQemuDriver) ForwardGuestAgent() bool {
723721
return l.vSockPort == 0 && l.virtioPort == ""
724722
}
725723

726-
func (l *LimaQemuDriver) AdditionalSetupForSSH(ctx context.Context) error {
727-
// Wait until the port is available.
728-
addr := net.JoinHostPort("127.0.0.1", fmt.Sprintf("%d", l.SSHLocalPort))
729-
dialContext := func(ctx context.Context) (net.Conn, error) {
730-
dialer := net.Dialer{Timeout: 1 * time.Second}
731-
return dialer.DialContext(ctx, "tcp", addr)
732-
}
733-
user := *l.Instance.Config.User.Name
734-
configDir, err := dirnames.LimaConfigDir()
735-
if err != nil {
736-
return err
737-
}
738-
privateKeyPath := filepath.Join(configDir, filenames.UserPrivateKey)
739-
if err := sshutil.WaitSSHReady(ctx, dialContext, addr, user, privateKeyPath, 600); err != nil {
740-
return err
741-
}
724+
func (l *LimaQemuDriver) AdditionalSetupForSSH(_ context.Context) error {
742725
return nil
743726
}

0 commit comments

Comments
 (0)