mirrors/flatcar-scripts
1
0
Fork 0
mirror of https://github.com/flatcar/scripts.git synced 2025-08-08 13:36:58 +02:00
Code Issues Packages Projects Releases Wiki Activity

Revert "build_library: set osType to otherlinux-64"

Browse Source 
This reverts commit 39bb800f16.

This change disabled a number of features so it isn't suitable for the
generic VMware templates. We need to re-trace our steps to list exactly
what tools/systems weren't accepting the linux26 type.
This commit is contained in:
Michael Marineau 2015-07-16 12:34:33 -07:00
parent 0b0aa88be3
commit d27bc5aeb3
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
build_library/template_vmware.ovf
View File

@ -16,7 +16,7 @@
<VirtualSystem ovf:id="@@NAME@@"> <VirtualSystem ovf:id="@@NAME@@">
<Info>A virtual machine</Info> <Info>A virtual machine</Info>
<Name>@@NAME@@</Name> <Name>@@NAME@@</Name>
<OperatingSystemSection ovf:id="101" vmw:osType="otherLinux64Guest"> <OperatingSystemSection ovf:id="100" vmw:osType="other26xLinux64Guest">
<Info>The kind of installed guest operating system</Info> <Info>The kind of installed guest operating system</Info>
</OperatingSystemSection> </OperatingSystemSection>
<VirtualHardwareSection> <VirtualHardwareSection>

2
build_library/vm_image_util.sh
View File

@ -691,7 +691,7 @@ ethernet0.addressType = "generated"
ethernet0.present = "TRUE" ethernet0.present = "TRUE"
ethernet0.virtualDev = "vmxnet3" ethernet0.virtualDev = "vmxnet3"
floppy0.present = "FALSE" floppy0.present = "FALSE"
guestOS = "otherlinux-64" guestOS = "other26xlinux-64"
memsize = "${vm_mem}" memsize = "${vm_mem}"
powerType.powerOff = "soft" powerType.powerOff = "soft"
powerType.powerOn = "hard" powerType.powerOn = "hard"