Guest OS table: add Debian 7 and SLES 12

These need to be added - and they are easy as they are aliases. No
bits need to be allocated. Find any place Debian 6 or SLES 11 is used
and add Debian 7 and SLES 12 respectively.

Signed-off-by: Dmitry Torokhov <dtor@vmware.com>

diff --git a/open-vm-tools/lib/include/guest_os.h b/open-vm-tools/lib/include/guest_os.h
index 18102fcab2d1cd16893466ad17df68ea53598ec6..b329c531a44605007eadf5aceb34b35218327d68 100644 (file)
--- a/open-vm-tools/lib/include/guest_os.h
+++ b/open-vm-tools/lib/include/guest_os.h
@@ -169,6 +169,7 @@ typedef enum GuestOSFamilyType {
 #define STR_OS_DEBIAN_4            "debian4"
 #define STR_OS_DEBIAN_5            "debian5"
 #define STR_OS_DEBIAN_6            "debian6"
+#define STR_OS_DEBIAN_7            "debian7"
 #define STR_OS_FEDORA              "Fedora"
 #define STR_OS_GENTOO              "Gentoo"
 #define STR_OS_IMMUNIX             "Immunix"
@@ -200,11 +201,13 @@ typedef enum GuestOSFamilyType {
 #define STR_OS_SLES_10_FULL       "SUSE Linux Enterprise Server 10"
 #define STR_OS_SLES_11            "sles11"
 #define STR_OS_SLES_11_FULL       "SUSE Linux Enterprise Server 11"
-#define STR_OS_SUSE               "suse"   
+#define STR_OS_SLES_12            "sles12"
+#define STR_OS_SLES_12_FULL       "SUSE Linux Enterprise Server 12"
+#define STR_OS_SUSE               "suse"
 #define STR_OS_SUSE_FULL          "SUSE Linux"
 #define STR_OS_OPENSUSE           "opensuse"
-#define STR_OS_SMESERVER          "SMEServer"   
-#define STR_OS_SUN_DESK           "sjds"   
+#define STR_OS_SMESERVER          "SMEServer"
+#define STR_OS_SUN_DESK           "sjds"
 #define STR_OS_SUN_DESK_FULL      "Sun Java Desktop System"
 #define STR_OS_TINYSOFA           "Tiny Sofa"  
 #define STR_OS_TURBO              "turbolinux"   

diff --git a/open-vm-tools/lib/include/guest_os_tables.h b/open-vm-tools/lib/include/guest_os_tables.h
index 7fae2c1fbd318f762e814ba0dc1a1a917915ca76..b6480d35c7832785523f38e39fc132cdce46ffd4 100644 (file)
--- a/open-vm-tools/lib/include/guest_os_tables.h
+++ b/open-vm-tools/lib/include/guest_os_tables.h
@@ -169,6 +169,8 @@
    GOSL(STR_OS_SLES "10-64",                 GUEST_OS_OTHER26XLINUX_64)     \
    GOSL(STR_OS_SLES "11",                    GUEST_OS_OTHER26XLINUX)        \
    GOSL(STR_OS_SLES "11-64",                 GUEST_OS_OTHER26XLINUX_64)     \
+   GOSL(STR_OS_SLES "12",                    GUEST_OS_OTHER26XLINUX)        \
+   GOSL(STR_OS_SLES "12-64",                 GUEST_OS_OTHER26XLINUX_64)     \
    GOSL(STR_OS_NOVELL,                       GUEST_OS_OTHER26XLINUX)        \
    GOSL(STR_OS_SUN_DESK,                     GUEST_OS_OTHER24XLINUX)        \
    GOSL(STR_OS_MANDRAKE,                     GUEST_OS_OTHER26XLINUX)        \
@@ -195,6 +197,8 @@
    GOSL(STR_OS_DEBIAN_5 "-64",               GUEST_OS_DEBIAN45_64)          \
    GOSL(STR_OS_DEBIAN_6,                     GUEST_OS_DEBIAN45)             \
    GOSL(STR_OS_DEBIAN_6 "-64",               GUEST_OS_DEBIAN45_64)          \
+   GOSL(STR_OS_DEBIAN_7,                     GUEST_OS_DEBIAN45)             \
+   GOSL(STR_OS_DEBIAN_7 "-64",               GUEST_OS_DEBIAN45_64)          \
    GOSL(STR_OS_SOLARIS "6",                  GUEST_OS_SOLARIS_6_AND_7)      \
    GOSL(STR_OS_SOLARIS "7",                  GUEST_OS_SOLARIS_6_AND_7)      \
    GOSL(STR_OS_SOLARIS "8",                  GUEST_OS_SOLARIS8)             \

diff --git a/open-vm-tools/lib/misc/hostinfoPosix.c b/open-vm-tools/lib/misc/hostinfoPosix.c
index 06d8fd16c3ef5d5c04b2b31a13d8e07f027d166a..f0b98075dc3e3861bd9fe13b8bfa9dab0bfda11b 100644 (file)
--- a/open-vm-tools/lib/misc/hostinfoPosix.c
+++ b/open-vm-tools/lib/misc/hostinfoPosix.c
@@ -524,8 +524,11 @@ HostinfoGetOSShortName(char *distro,         // IN: full distro name
       Str_Strcpy(distroShort, STR_OS_OPENSUSE, distroShortSize);
    } else if (strstr(distroLower, "suse")) {
       if (strstr(distroLower, "enterprise")) {
-         if (strstr(distroLower, "server 11") ||
-             strstr(distroLower, "desktop 11")) {
+         if (strstr(distroLower, "server 12") ||
+             strstr(distroLower, "desktop 12")) {
+            Str_Strcpy(distroShort, STR_OS_SLES_12, distroShortSize);
+         } else if (strstr(distroLower, "server 11") ||
+                    strstr(distroLower, "desktop 11")) {
             Str_Strcpy(distroShort, STR_OS_SLES_11, distroShortSize);
          } else if (strstr(distroLower, "server 10") ||
                     strstr(distroLower, "desktop 10")) {
@@ -575,6 +578,8 @@ HostinfoGetOSShortName(char *distro,         // IN: full distro name
          Str_Strcpy(distroShort, STR_OS_DEBIAN_5, distroShortSize);
       } else if (strstr(distroLower, "6.0")) {
          Str_Strcpy(distroShort, STR_OS_DEBIAN_6, distroShortSize);
+      } else if (strstr(distroLower, "7.0")) {
+         Str_Strcpy(distroShort, STR_OS_DEBIAN_7, distroShortSize);
       }
    } else if (StrUtil_StartsWith(distroLower, "enterprise linux") ||
               StrUtil_StartsWith(distroLower, "oracle")) {