alt-orchestra/talos
1
0
Fork 0
Code Issues Pull Requests Actions 27 Packages Projects Releases Wiki Activity

fix: update vmware image and platform

Browse Source 
Multiple fixes from local testing:

* `.ova` file shouldn't contain `./` entries
* fix error message (`err` is `nil` at that point)
* drop `efi` boot key (BIOS mode works fine)

Signed-off-by: Andrey Smirnov <smirnov.andrey@gmail.com>
This commit is contained in:
Andrey Smirnov 2020-09-08 00:13:49 +03:00 committed by talos-bot
parent 93f6586900
commit dd614c4f35
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
cmd/installer/pkg/ova/ova.go
View File

@ -20,7 +20,8 @@ import (
)
const mfTpl = `SHA256({{ .VMDK }})= {{ .VMDKSHA }}
SHA256({{ .OVF }})= {{ .OVFSHA }}`
SHA256({{ .OVF }})= {{ .OVFSHA }}
`
// OVF format reference: https://www.dmtf.org/standards/ovf.
//nolint: lll
@ -113,7 +114,6 @@ const ovfTpl = `<?xml version="1.0" encoding="UTF-8"?>
<rasd:ResourceSubType>vmware.vmci</rasd:ResourceSubType>
<rasd:ResourceType>1</rasd:ResourceType>
</Item>
<vmw:Config ovf:required="false" vmw:key="firmware" vmw:value="efi"/>
<vmw:Config ovf:required="false" vmw:key="tools.syncTimeWithHost" vmw:value="false"/>
<vmw:Config ovf:required="false" vmw:key="tools.afterPowerOn" vmw:value="true"/>
<vmw:Config ovf:required="false" vmw:key="tools.afterResume" vmw:value="true"/>
@ -184,7 +184,7 @@ func CreateOVAFromRAW(name, src, out string) (err error) {
return err
}
if _, err = cmd.Run("tar", "-cvf", filepath.Join(out, "vmware.ova"), ".", "-C", dir); err != nil {
if _, err = cmd.Run("tar", "-cvf", filepath.Join(out, "vmware.ova"), "-C", dir, name+".ovf", name+".mf", name+".vmdk"); err != nil {
return err
}

4
internal/app/machined/pkg/runtime/v1alpha1/platform/vmware/vmware_amd64.go
View File

@ -57,7 +57,7 @@ func (v *VMware) Configuration() ([]byte, error) {
}
if val == "" {
return nil, fmt.Errorf("config is required, no value found for guestinfo.%s: %w", constants.VMwareGuestInfoConfigKey, err)
return nil, fmt.Errorf("config is required, no value found for guestinfo: %q", constants.VMwareGuestInfoConfigKey)
}
b, err := base64.StdEncoding.DecodeString(val)
@ -89,7 +89,7 @@ func (v *VMware) ExternalIPs() (addrs []net.IP, err error) {
// KernelArgs implements the runtime.Platform interface.
func (v *VMware) KernelArgs() procfs.Parameters {
return []*procfs.Parameter{
procfs.NewParameter("console").Append("tty0"),
procfs.NewParameter("console").Append("tty0").Append("ttyS0"),
procfs.NewParameter("earlyprintk").Append("ttyS0,115200"),
}
}