From: Oliver Kurth <okurth@vmware.com>
Date: Tue, 24 Oct 2017 21:07:33 +0000 (-0700)
Subject: Misc GuestOS ID fixes.
X-Git-Tag: stable-10.3.0~230
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8bdee4f53760e3a63a890653a0960c09b9258db9;p=thirdparty%2Fopen-vm-tools.git

Misc GuestOS ID fixes.

- Centos8 64bit guest will have linux 4.x. Moved Centos8-64 guest id
  from all3xlinux64 to all4xlinux64 guest list.
- oracle8_64 is missing in the list. Added it to all4xlinux64 guest list.
- Photon has linux 4.x. Moved photon from all3xlinux64 to all4xlinux64
  guest list.

- Changed the HostinfoOSData() function to return other4xlinux for
  the distros where the version cannot be determined.
---

diff --git a/open-vm-tools/lib/include/guest_os.h b/open-vm-tools/lib/include/guest_os.h
index 0d8bad37f..0e3b587e8 100644
--- a/open-vm-tools/lib/include/guest_os.h
+++ b/open-vm-tools/lib/include/guest_os.h
@@ -179,13 +179,14 @@ Bool Gos_InSetArray(uint32 gos, const uint32 *set);
 
 #define ALL3XLINUX32          BS(OTHER3XLINUX), BS(CENTOS6), BS(ORACLE6)
 
-#define ALL3XLINUX64          BS(OTHER3XLINUX_64), BS(PHOTON_64), \
-                              BS(CENTOS6_64), BS(CENTOS7_64), BS(CENTOS8_64),\
+#define ALL3XLINUX64          BS(OTHER3XLINUX_64), \
+                              BS(CENTOS6_64), BS(CENTOS7_64), \
                               BS(ORACLE6_64), BS(ORACLE7_64)
 
 #define ALL4XLINUX32          BS(OTHER4XLINUX)
 
-#define ALL4XLINUX64          BS(OTHER4XLINUX_64)
+#define ALL4XLINUX64          BS(OTHER4XLINUX_64), BS(PHOTON_64), \
+                              BS(CENTOS8_64), BS(ORACLE8_64)
 
 #define ALLVMKERNEL           BS(VMKERNEL), BS(VMKERNEL5), BS(VMKERNEL6), \
                               BS(VMKERNEL65)
diff --git a/open-vm-tools/lib/misc/hostinfoPosix.c b/open-vm-tools/lib/misc/hostinfoPosix.c
index 46f156093..d3a86230b 100644
--- a/open-vm-tools/lib/misc/hostinfoPosix.c
+++ b/open-vm-tools/lib/misc/hostinfoPosix.c
@@ -1019,7 +1019,7 @@ HostinfoOSData(void)
 
          Str_Sprintf(distro, sizeof distro, "Other Linux %d.%d kernel",
                      majorVersion, Hostinfo_OSVersion(1));
-         Str_Strcpy(distroShort, STR_OS_OTHER_3X, distroSize);
+         Str_Strcpy(distroShort, STR_OS_OTHER_4X, distroSize);
       }
 
       /*