summaryrefslogtreecommitdiff
path: root/pkg/machine/qemu/machine.go
diff options
context:
space:
mode:
authorOpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com>2022-09-27 02:15:42 +0200
committerGitHub <noreply@github.com>2022-09-27 02:15:42 +0200
commit98e26278844506e64e311810f97bffcc7efc0b8a (patch)
treede2e77c1852b505891c11d4cecfac5a1945abf0d /pkg/machine/qemu/machine.go
parent5fc6d95a947bdf0e0bf013ee282c4a0f99b52a5a (diff)
parent2e4e1bb97cdd0fbef7ada673fa97f6b4989998eb (diff)
downloadpodman-98e26278844506e64e311810f97bffcc7efc0b8a.tar.gz
podman-98e26278844506e64e311810f97bffcc7efc0b8a.tar.bz2
podman-98e26278844506e64e311810f97bffcc7efc0b8a.zip
Merge pull request #15471 from cdoern/ssh
podman machine ssh handling
Diffstat (limited to 'pkg/machine/qemu/machine.go')
-rw-r--r--pkg/machine/qemu/machine.go3
1 files changed, 2 insertions, 1 deletions
diff --git a/pkg/machine/qemu/machine.go b/pkg/machine/qemu/machine.go
index fab25aa35..a6907c0df 100644
--- a/pkg/machine/qemu/machine.go
+++ b/pkg/machine/qemu/machine.go
@@ -405,6 +405,7 @@ func (v *MachineVM) Init(opts machine.InitOptions) (bool, error) {
WritePath: v.getIgnitionFile(),
UID: v.UID,
}
+
err = machine.NewIgnitionFile(ign)
return err == nil, err
}
@@ -1033,7 +1034,7 @@ func (v *MachineVM) SSH(_ string, opts machine.SSHOptions) error {
sshDestination := username + "@localhost"
port := strconv.Itoa(v.Port)
- args := []string{"-i", v.IdentityPath, "-p", port, sshDestination, "-o", "UserKnownHostsFile=/dev/null",
+ args := []string{"-i", v.IdentityPath, "-p", port, sshDestination,
"-o", "StrictHostKeyChecking=no", "-o", "LogLevel=ERROR", "-o", "SetEnv=LC_ALL="}
if len(opts.Args) > 0 {
args = append(args, opts.Args...)