]> git.ipfire.org Git - thirdparty/open-vm-tools.git/commitdiff
Add SUSE Server for SAP Applications to hostinfoPosix.c
authorOliver Kurth <okurth@vmware.com>
Wed, 15 Nov 2017 21:32:55 +0000 (13:32 -0800)
committerOliver Kurth <okurth@vmware.com>
Wed, 15 Nov 2017 21:32:55 +0000 (13:32 -0800)
On SLES-SP1-SAP the "lsb_release -sd" command returns the string
"SUSE Linux Enterprise Server for SAP Applications 12 SP1".
Parsing in HostinfoGetOSShortName() detects the sub-strings "suse"
and "enterprise" but not "server 12".  STR_OS_SLES is returned
resulting in displaying of "SUSE Linux Enterprise 8/9" in the
summary screen of the vSphere client.  This is wrong.

Instead, search for the sub-string "server for sap applications 12"
and return STR_OS_SLES_12.  SLES11-SAP is not affected.

Please see: github.com/vmware/open-vm-tools/pull/123

open-vm-tools/AUTHORS
open-vm-tools/lib/misc/hostinfoPosix.c

index 348ec2acd2792ecaa07317233be882186ca7737b..4f94efee169df448c9d72f3a4d6487aa83c28487 100644 (file)
@@ -10,3 +10,6 @@ Bernd Zeimetz   Fix gcc6 build issues in linuxDeployment.c file.
 
 Josh Paetzel    Add support for 64-bit inodes in FreeBSD 12
                 - https://github.com/vmware/open-vm-tools/pull/190
+
+Sebastian Parschauer    Add support to properly report SLES12-SAP
+                - https://github.com/vmware/open-vm-tools/pull/123
index d3a86230be77e4bbfa03b8f8ad52961e8b7fbf23..cb31595993c620c32c30253c3ad2a9e41cd97894 100644 (file)
@@ -526,7 +526,8 @@ HostinfoGetOSShortName(char *distro,         // IN: full distro name
              strstr(distroLower, "desktop 15")) {
             Str_Strcpy(distroShort, STR_OS_SLES_15, distroShortSize);
          } else if (strstr(distroLower, "server 12") ||
-             strstr(distroLower, "desktop 12")) {
+                    strstr(distroLower, "server for sap applications 12") ||
+                    strstr(distroLower, "desktop 12")) {
             Str_Strcpy(distroShort, STR_OS_SLES_12, distroShortSize);
          } else if (strstr(distroLower, "server 11") ||
                     strstr(distroLower, "desktop 11")) {