Browse code
Updating open-vm-tools to 10.2.0
Change-Id: Id1f27c1d56ef2c3567d037248d803755697f6731
Reviewed-on: http://photon-jenkins.eng.vmware.com:8082/4686
Tested-by: gerrit-photon <photon-checkins@vmware.com>
Reviewed-by: Anish Swaminathan <anishs@vmware.com>
Kumar Kaushik authored on 2018/01/25 10:23:09Showing 2 changed files
| ... | ... |
@@ -1,7 +1,7 @@ |
| 1 |
-diff -ru open-vm-tools-stable-10.1.5/open-vm-tools/libDeployPkg/linuxDeployment.c open-vm-tools-stable-10.1.5-modified/open-vm-tools/libDeployPkg/linuxDeployment.c |
|
| 2 |
-+++ open-vm-tools-stable-10.1.5-modified/open-vm-tools/libDeployPkg/linuxDeployment.c 2017-03-03 15:55:49.921709009 -0800 |
|
| 3 |
-@@ -558,13 +558,17 @@ |
|
| 1 |
+diff -ru open-vm-tools-stable-10.2.0/open-vm-tools/libDeployPkg/linuxDeployment.c open-vm-tools-stable-10.2.0-modified/open-vm-tools/libDeployPkg/linuxDeployment.c |
|
| 2 |
+--- open-vm-tools-stable-10.2.0/open-vm-tools/libDeployPkg/linuxDeployment.c 2017-12-15 13:11:49.000000000 -0800 |
|
| 3 |
+@@ -593,13 +593,17 @@ |
|
| 4 | 4 |
close(fd); |
| 5 | 5 |
|
| 6 | 6 |
// Create space and copy the command |
| ... | ... |
@@ -21,11 +21,11 @@ diff -ru open-vm-tools-stable-10.1.5/open-vm-tools/libDeployPkg/linuxDeployment. |
| 21 | 21 |
*archiveType = hdr.payloadType; |
| 22 | 22 |
*flags = hdr.reserved; |
| 23 | 23 |
|
| 24 |
-@@ -1042,6 +1046,18 @@ |
|
| 24 |
+@@ -1190,6 +1194,18 @@ |
|
| 25 | 25 |
free(command); |
| 26 |
- deployStatus = CloudInitSetup(EXTRACTPATH); |
|
| 26 |
+ deployStatus = CloudInitSetup(tmpDirPath); |
|
| 27 | 27 |
} else {
|
| 28 |
-+ if ((strstr(command, "scripts/Customize.pl") != NULL) || (strstr(command, "scripts/customize.sh") != NULL)) {
|
|
| 28 |
++ if ((strstr(command, "scripts/Customize.pl") != NULL) || (strstr(command, "scripts/customize.sh") != NULL)) {
|
|
| 29 | 29 |
+ free (command); |
| 30 | 30 |
+ const char* PHOTON_OS_LAUNCH_COMMAND = "/bin/bash /usr/share/open-vm-tools/GOSC/gosc-scripts/imc-shell/imgcust-scripts/customize.sh /tmp/.vmware/linux/deploy/cust.cfg"; |
| 31 | 31 |
+ |
| ... | ... |
@@ -37,6 +37,6 @@ diff -ru open-vm-tools-stable-10.1.5/open-vm-tools/libDeployPkg/linuxDeployment. |
| 37 | 37 |
+ } |
| 38 | 38 |
+ _DeployPkg_SkipReboot(true); |
| 39 | 39 |
+ } |
| 40 |
- // Run the deployment command |
|
| 41 |
- sLog(log_info, "Launching deployment %s. \n", command); |
|
| 40 |
+ sLog(log_info, "Executing traditional GOSC workflow"); |
|
| 42 | 41 |
deploymentResult = ForkExecAndWaitCommand(command); |
| 42 |
+ free(command); |
| ... | ... |
@@ -1,14 +1,14 @@ |
| 1 | 1 |
Summary: Usermode tools for VmWare virts |
| 2 | 2 |
Name: open-vm-tools |
| 3 |
-Version: 10.1.5 |
|
| 4 |
-Release: 3%{?dist}
|
|
| 3 |
+Version: 10.2.0 |
|
| 4 |
+Release: 1%{?dist}
|
|
| 5 | 5 |
License: LGPLv2+ |
| 6 | 6 |
URL: https://github.com/vmware/open-vm-tools |
| 7 | 7 |
Group: Applications/System |
| 8 | 8 |
Vendor: VMware, Inc. |
| 9 | 9 |
Distribution: Photon |
| 10 | 10 |
Source0: https://github.com/vmware/open-vm-tools/archive/%{name}-stable-%{version}.tar.gz
|
| 11 |
-%define sha1 open-vm-tools=9672874e8b785de27d7fda57bf791f900546c18f |
|
| 11 |
+%define sha1 open-vm-tools=adba97493c4f96db6281a6964ee26b17b5adc5c5 |
|
| 12 | 12 |
Source1: gosc-scripts-1.0.tar.gz |
| 13 | 13 |
%define sha1 gosc-scripts-1.0=5031dd9b3b0569a40d2ee0caaa55a1cbf782345e |
| 14 | 14 |
Source2: vmtoolsd.service |
| ... | ... |
@@ -98,6 +98,8 @@ fi |
| 98 | 98 |
|
| 99 | 99 |
|
| 100 | 100 |
%changelog |
| 101 |
+* Wed Jan 24 2018 Kumar Kaushik <kaushikk@vmware.com> 10.2.0-1 |
|
| 102 |
+- Updating to version 10.2.0 |
|
| 101 | 103 |
* Thu Nov 30 2017 Kumar Kaushik <kaushikk@vmware.com> 10.1.5-3 |
| 102 | 104 |
- Revert changing systemd service file dependency with cloud-init. |
| 103 | 105 |
* Fri Nov 17 2017 Kumar Kaushik <kaushikk@vmware.com> 10.1.5-2 |