From d27bc5aeb38e6232d975e3fd90f95fd806923b4a Mon Sep 17 00:00:00 2001
From: Michael Marineau <michael.marineau@coreos.com>
Date: Thu, 16 Jul 2015 12:34:33 -0700
Subject: [PATCH] Revert "build_library: set osType to otherlinux-64"

This reverts commit 39bb800f16afd077c3e7d930450bf327a6d895db.

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.
---
 build_library/template_vmware.ovf | 2 +-
 build_library/vm_image_util.sh    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/build_library/template_vmware.ovf b/build_library/template_vmware.ovf
index b5f97a5e37..e4c2cbb176 100644
--- a/build_library/template_vmware.ovf
+++ b/build_library/template_vmware.ovf
@@ -16,7 +16,7 @@
   <VirtualSystem ovf:id="@@NAME@@">
     <Info>A virtual machine</Info>
     <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>
     </OperatingSystemSection>
     <VirtualHardwareSection>
diff --git a/build_library/vm_image_util.sh b/build_library/vm_image_util.sh
index 4ef88e1b90..bb5b3f5c5d 100644
--- a/build_library/vm_image_util.sh
+++ b/build_library/vm_image_util.sh
@@ -691,7 +691,7 @@ ethernet0.addressType = "generated"
 ethernet0.present = "TRUE"
 ethernet0.virtualDev = "vmxnet3"
 floppy0.present = "FALSE"
-guestOS = "otherlinux-64"
+guestOS = "other26xlinux-64"
 memsize = "${vm_mem}"
 powerType.powerOff = "soft"
 powerType.powerOn = "hard"