From: Oliver Kurth <okurth@vmware.com>
Date: Fri, 15 Sep 2017 18:23:58 +0000 (-0700)
Subject: GOSTable: Add MacOS 10.14 and FreeBSD 12
X-Git-Tag: stable-10.2.0~33
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f439d57482f7dd42e359fb0792269573c63c55a7;p=thirdparty%2Fopen-vm-tools.git

GOSTable: Add MacOS 10.14 and FreeBSD 12
---

diff --git a/open-vm-tools/lib/include/guest_os.h b/open-vm-tools/lib/include/guest_os.h
index e3e46ccf4..def97e6f8 100644
--- a/open-vm-tools/lib/include/guest_os.h
+++ b/open-vm-tools/lib/include/guest_os.h
@@ -84,8 +84,9 @@ Bool Gos_InSetArray(uint32 gos, const uint32 *set);
 #define ALLWINXP64            BS(WINXPPRO_64)
 #define ALLWINXP              ALLWINXP32, ALLWINXP64
 
-#define ALLFREEBSD            BS(FREEBSD), BS(FREEBSD_64), \
-                              BS(FREEBSD11), BS(FREEBSD11_64)
+#define ALLFREEBSD            BS(FREEBSD),   BS(FREEBSD_64),   \
+                              BS(FREEBSD11), BS(FREEBSD11_64), \
+                              BS(FREEBSD12), BS(FREEBSD12_64)
 
 #define ALLWINNET32           BS(WINNET)
 #define ALLWINNET64           BS(WINNET_64)
@@ -191,15 +192,16 @@ Bool Gos_InSetArray(uint32 gos, const uint32 *set);
                               ALL3XLINUX64, BS(OTHERLINUX_64)
 #define ALLLINUX              ALLLINUX32, ALLLINUX64
 #define ALLDARWIN32           BS(DARWIN9), BS(DARWIN10), BS(DARWIN11)
-#define ALLDARWIN64           BS(DARWIN9_64), BS(DARWIN10_64), \
+#define ALLDARWIN64           BS(DARWIN9_64),  BS(DARWIN10_64), \
                               BS(DARWIN11_64), BS(DARWIN12_64), \
                               BS(DARWIN13_64), BS(DARWIN14_64), \
                               BS(DARWIN15_64), BS(DARWIN16_64), \
-                              BS(DARWIN17_64)
+                              BS(DARWIN17_64), BS(DARWIN18_64)
 #define ALLDARWIN             ALLDARWIN32, ALLDARWIN64
 #define ALL64                 ALLWIN64, ALLLINUX64, BS(SOLARIS10_64), \
-                              BS(FREEBSD_64), BS(FREEBSD11_64), \
-                              ALLDARWIN64, BS(OTHER_64), ALLVMKERNEL
+                              BS(FREEBSD_64), BS(FREEBSD11_64),       \
+                              BS(FREEBSD12_64), BS(OTHER_64),         \
+                              ALLDARWIN64, ALLVMKERNEL
 
 #define ALLECOMSTATION        BS(ECOMSTATION), BS(ECOMSTATION2)
 #define ALLOS2                BS(OS2), ALLECOMSTATION
@@ -512,6 +514,7 @@ Bool Gos_InSetArray(uint32 gos, const uint32 *set);
 /* FreeBSD */
 #define STR_OS_FREEBSD   "freeBSD"
 #define STR_OS_FREEBSD11 "freeBSD11"
+#define STR_OS_FREEBSD12 "freeBSD12"
 
 /* Solaris */
 #define STR_OS_SOLARIS "solaris"
diff --git a/open-vm-tools/lib/include/guest_os_tables.h b/open-vm-tools/lib/include/guest_os_tables.h
index e5d7c3864..63a391691 100644
--- a/open-vm-tools/lib/include/guest_os_tables.h
+++ b/open-vm-tools/lib/include/guest_os_tables.h
@@ -77,6 +77,8 @@ extern "C" {
    GOT(GUEST_OS_FREEBSD_64)                                                \
    GOT(GUEST_OS_FREEBSD11)                                                 \
    GOT(GUEST_OS_FREEBSD11_64)                                              \
+   GOT(GUEST_OS_FREEBSD12)                                                 \
+   GOT(GUEST_OS_FREEBSD12_64)                                              \
    GOT(GUEST_OS_SOLARIS_6_AND_7)                                           \
    GOT(GUEST_OS_SOLARIS8)                                                  \
    GOT(GUEST_OS_SOLARIS9)                                                  \
@@ -95,6 +97,7 @@ extern "C" {
    GOT(GUEST_OS_DARWIN15_64)       /* Mac OS 10.11 */                      \
    GOT(GUEST_OS_DARWIN16_64)       /* Mac OS 10.12 */                      \
    GOT(GUEST_OS_DARWIN17_64)       /* Mac OS 10.13 */                      \
+   GOT(GUEST_OS_DARWIN18_64)       /* Mac OS 10.14 */                      \
    GOT(GUEST_OS_OPENSERVER_5_AND_6)                                        \
    GOT(GUEST_OS_UNIXWARE7)                                                 \
    GOT(GUEST_OS_NETWARE4)                                                  \
@@ -147,6 +150,7 @@ extern "C" {
    GOSL(STR_OS_MACOS "15-64",                GUEST_OS_DARWIN15_64,            "darwin.iso")           \
    GOSL(STR_OS_MACOS "16-64",                GUEST_OS_DARWIN16_64,            "darwin.iso")           \
    GOSL(STR_OS_MACOS "17-64",                GUEST_OS_DARWIN17_64,            "darwin.iso")           \
+   GOSL(STR_OS_MACOS "18-64",                GUEST_OS_DARWIN18_64,            "darwin.iso")           \
    GOSL(STR_OS_DEBIAN_10,                    GUEST_OS_DEBIAN,                 "linux.iso")            \
    GOSL(STR_OS_DEBIAN_10 "-64",              GUEST_OS_DEBIAN_64,              "linux.iso")            \
    GOSL(STR_OS_DEBIAN_4,                     GUEST_OS_DEBIAN,                 "linuxPreGlibc25.iso")  \
@@ -170,6 +174,8 @@ extern "C" {
    GOSL(STR_OS_FREEBSD "-64",                GUEST_OS_FREEBSD_64,             "freebsd.iso")          \
    GOSL(STR_OS_FREEBSD "11",                 GUEST_OS_FREEBSD11,              "freebsd.iso")          \
    GOSL(STR_OS_FREEBSD "11-64",              GUEST_OS_FREEBSD11_64,           "freebsd.iso")          \
+   GOSL(STR_OS_FREEBSD "12",                 GUEST_OS_FREEBSD12,              "freebsd.iso")          \
+   GOSL(STR_OS_FREEBSD "12-64",              GUEST_OS_FREEBSD12_64,           "freebsd.iso")          \
    GOSL("linux",                             GUEST_OS_OTHERLINUX,             "linuxPreGlibc25.iso") /* old */ \
    GOSL(STR_OS_WIN_LONG,                     GUEST_OS_LONGHORN,               "windows.iso")          \
    GOSL("longhorn-64",                       GUEST_OS_LONGHORN_64,            "windows.iso")          \
diff --git a/open-vm-tools/lib/misc/hostinfoPosix.c b/open-vm-tools/lib/misc/hostinfoPosix.c
index f2167078c..5d2123d03 100644
--- a/open-vm-tools/lib/misc/hostinfoPosix.c
+++ b/open-vm-tools/lib/misc/hostinfoPosix.c
@@ -1099,11 +1099,14 @@ HostinfoOSData(void)
       majorVersion = Hostinfo_OSVersion(0);
 
       /*
-       * FreeBSD 11 and later are identified using
-       * a different guestId.
+       * FreeBSD 11 and later are identified using a different guestId.
        */
       if (majorVersion >= 11) {
-         Str_Strcpy(distroShort, STR_OS_FREEBSD11, sizeof distroShort);
+         if (majorVersion >= 12) {
+            Str_Strcpy(distroShort, STR_OS_FREEBSD12, sizeof distroShort);
+         } else {
+            Str_Strcpy(distroShort, STR_OS_FREEBSD11, sizeof distroShort);
+         }
       } else {
          Str_Strcpy(distroShort, STR_OS_FREEBSD, sizeof distroShort);
       }