From: Oliver Kurth <okurth@vmware.com>
Date: Wed, 7 Jun 2017 00:17:03 +0000 (-0700)
Subject: GOSTable: split FreeBSD
X-Git-Tag: stable-10.1.10~9
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f4b546e5bd6e27135ad1d6381e259c2e55fc6357;p=thirdparty%2Fopen-vm-tools.git

GOSTable: split FreeBSD

Split FreeBSD into freeBSD (old) and freeBSD11 (going
forward). This is to cover driver differences.
---

diff --git a/open-vm-tools/lib/include/guest_os.h b/open-vm-tools/lib/include/guest_os.h
index ef202e3c5..d0a2aa472 100644
--- a/open-vm-tools/lib/include/guest_os.h
+++ b/open-vm-tools/lib/include/guest_os.h
@@ -1,5 +1,5 @@
 /*********************************************************
- * Copyright (C) 1998-2016 VMware, Inc. All rights reserved.
+ * Copyright (C) 1998-2017 VMware, Inc. All rights reserved.
  *
  * This program is free software; you can redistribute it and/or modify it
  * under the terms of the GNU Lesser General Public License as published
@@ -80,7 +80,8 @@ Bool Gos_InSetArray(uint32 gos, const uint32 *set);
 #define ALLWINXP64            BS(WINXPPRO_64)
 #define ALLWINXP              ALLWINXP32, ALLWINXP64
 
-#define ALLFREEBSD            BS(FREEBSD), BS(FREEBSD_64)
+#define ALLFREEBSD            BS(FREEBSD), BS(FREEBSD_64), \
+                              BS(FREEBSD11), BS(FREEBSD11_64)
 
 #define ALLWINNET32           BS(WINNET)
 #define ALLWINNET64           BS(WINNET_64)
@@ -185,8 +186,8 @@ Bool Gos_InSetArray(uint32 gos, const uint32 *set);
                               BS(DARWIN15_64), BS(DARWIN16_64)
 #define ALLDARWIN             ALLDARWIN32, ALLDARWIN64
 #define ALL64                 ALLWIN64, ALLLINUX64, BS(SOLARIS10_64), \
-                              BS(FREEBSD_64), ALLDARWIN64,            \
-                              BS(OTHER_64), ALLVMKERNEL
+                              BS(FREEBSD_64), BS(FREEBSD11_64), \
+                              ALLDARWIN64, BS(OTHER_64), ALLVMKERNEL
 
 #define ALLECOMSTATION        BS(ECOMSTATION), BS(ECOMSTATION2)
 #define ALLOS2                BS(OS2), ALLECOMSTATION
@@ -492,7 +493,7 @@ Bool Gos_InSetArray(uint32 gos, const uint32 *set);
 #define STR_OS_WIN_64_BIT_EXTENSION ", 64-bit"
 
 /* FreeBSD */
-#define STR_OS_FREEBSD "FreeBSD"
+#define STR_OS_FREEBSD "freeBSD"
 
 /* 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 a421e0b4a..58dffe168 100644
--- a/open-vm-tools/lib/include/guest_os_tables.h
+++ b/open-vm-tools/lib/include/guest_os_tables.h
@@ -71,6 +71,8 @@
    GOT(GUEST_OS_RHEL_64)                                                   \
    GOT(GUEST_OS_FREEBSD)                                                   \
    GOT(GUEST_OS_FREEBSD_64)                                                \
+   GOT(GUEST_OS_FREEBSD11)                                                 \
+   GOT(GUEST_OS_FREEBSD11_64)                                              \
    GOT(GUEST_OS_SOLARIS_6_AND_7)                                           \
    GOT(GUEST_OS_SOLARIS8)                                                  \
    GOT(GUEST_OS_SOLARIS9)                                                  \
@@ -154,8 +156,10 @@
    GOSL(STR_OS_ECOMSTATION "2",              GUEST_OS_ECOMSTATION2,           NULL)                   \
    GOSL("fedora",                            GUEST_OS_OTHER26XLINUX,          "linux.iso")            \
    GOSL("fedora-64",                         GUEST_OS_OTHER26XLINUX_64,       "linux.iso")            \
-   GOSL("freeBSD",                           GUEST_OS_FREEBSD,                "freebsd.iso")          \
-   GOSL("freeBSD-64",                        GUEST_OS_FREEBSD_64,             "freebsd.iso")          \
+   GOSL(STR_OS_FREEBSD,                      GUEST_OS_FREEBSD,                "freebsd.iso")          \
+   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("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")          \