From: VMware, Inc <>
Date: Mon, 26 Jul 2010 18:12:01 +0000 (-0700)
Subject: GuestInfo: Identify SLED as SLES.
X-Git-Tag: 2010.07.25-280253~100
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=363b4b17aba4e33b2aa3de4cdc507c5e121820b9;p=thirdparty%2Fopen-vm-tools.git

GuestInfo: Identify SLED as SLES.

Per bug 572710 comment #8:

"With respect to running of a VM, we have decided that we do not need to
differentiate between SLES & SLED. So we offer only one selection for the two. I
think in the future, the UI will begin to call it 'SLE' in most cases."

Signed-off-by: Marcelo Vanzin <mvanzin@vmware.com>
---

diff --git a/open-vm-tools/lib/misc/hostinfoPosix.c b/open-vm-tools/lib/misc/hostinfoPosix.c
index 5335dc934..0701a0a0f 100644
--- a/open-vm-tools/lib/misc/hostinfoPosix.c
+++ b/open-vm-tools/lib/misc/hostinfoPosix.c
@@ -501,9 +501,11 @@ HostinfoGetOSShortName(char *distro,         // IN: full distro name
       }
    } else if (strstr(distroLower, "suse")) {
       if (strstr(distroLower, "enterprise")) {
-         if (strstr(distroLower, "server 11")) {
+         if (strstr(distroLower, "server 11") ||
+             strstr(distroLower, "desktop 11")) {
             Str_Strcpy(distroShort, STR_OS_SLES_11, distroShortSize);
-         } else if (strstr(distroLower, "server 10")) {
+         } else if (strstr(distroLower, "server 10") ||
+                    strstr(distroLower, "desktop 10")) {
             Str_Strcpy(distroShort, STR_OS_SLES_10, distroShortSize);
          } else {
             Str_Strcpy(distroShort, STR_OS_SUSE_EN, distroShortSize);