Hello community, here is the log from the commit of package open-vm-tools for openSUSE:Factory checked in at 2017-02-09 11:17:57 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/open-vm-tools (Old) and /work/SRC/openSUSE:Factory/.open-vm-tools.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "open-vm-tools" Changes: -------- --- /work/SRC/openSUSE:Factory/open-vm-tools/open-vm-tools.changes 2016-12-03 18:28:01.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.open-vm-tools.new/open-vm-tools.changes 2017-02-09 11:17:59.262941562 +0100 @@ -1,0 +2,12 @@ +Tue Feb 7 21:40:39 UTC 2017 - [email protected] + +- Sumbitting update for SLE11SP4, SLE12SP1, SLE12SP2 + see fate#322214 & fate#322218 + +------------------------------------------------------------------- +Wed Dec 14 14:57:52 CET 2016 - [email protected] + +- Report SLES12-SAP guest OS as SLES12 (bsc#1013496) + + Report-SLES12-SAP-guest-OS-as-SLES12.patch + +------------------------------------------------------------------- @@ -20 +32,2 @@ - + Fix for quiesced snapshot failure leaving guest file system quiesced + + Fix for quiesced snapshot failure leaving guest file system + quiesced (bsc#1006796) New: ---- Report-SLES12-SAP-guest-OS-as-SLES12.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ open-vm-tools.spec ++++++ --- /var/tmp/diff_new_pack.1Eknfj/_old 2017-02-09 11:18:00.170813092 +0100 +++ /var/tmp/diff_new_pack.1Eknfj/_new 2017-02-09 11:18:00.174812527 +0100 @@ -1,7 +1,7 @@ # # spec file for package open-vm-tools # -# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. # Copyright (c) 2010 Dominique Leuenberger, Amsterdam, Netherlands. # # All modifications and additions to the file contributed by third parties @@ -139,6 +139,7 @@ Requires(pre): %fillup_prereq Requires(pre): %insserv_prereq ExclusiveArch: %ix86 x86_64 +Patch0: Report-SLES12-SAP-guest-OS-as-SLES12.patch %if %{with systemd} %systemd_requires @@ -206,6 +207,7 @@ %setup -q -n %{tarname}-%{version}/%{subname} # fix for an rpmlint warning regarding wrong line feeds sed -i -e "s/\r//" README +%patch0 -p2 %build # disable warning unused-but-set-variable which will raise error because of -Werror ++++++ Report-SLES12-SAP-guest-OS-as-SLES12.patch ++++++ From: Sebastian Parschauer <[email protected]> Date: Wed, 14 Dec 2016 14:28:42 +0100 Subject: Report SLES12-SAP guest OS as SLES12 References: bsc#1013496 Patch-mainline: Submitted, 2016-12-14 16:29 UTC+1 as GitHub PR 123 Git-commit: 35668574ecd785834b3de85d9b5f1c5999fbdba9 Git-repo: https://github.com/sriemer/open-vm-tools On SLES12-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. So search for the sub-string "server for sap applications 12" and return STR_OS_SLES_12 there. SLES11-SAP is not affected. Signed-off-by: Sebastian Parschauer <[email protected]> --- open-vm-tools/lib/misc/hostinfoPosix.c | 1 + 1 file changed, 1 insertion(+) diff --git a/open-vm-tools/lib/misc/hostinfoPosix.c b/open-vm-tools/lib/misc/hostinfoPosix.c index 0f55070..59f40f7 100644 --- a/open-vm-tools/lib/misc/hostinfoPosix.c +++ b/open-vm-tools/lib/misc/hostinfoPosix.c @@ -534,6 +534,7 @@ HostinfoGetOSShortName(char *distro, // IN: full distro name } else if (strstr(distroLower, "suse")) { if (strstr(distroLower, "enterprise")) { if (strstr(distroLower, "server 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") ||
