Browse code
Updating open-vm-tools to 10.2.0
Change-Id: Idf11a2e90205001788b6357ecd84887872e0bc12
Reviewed-on: http://photon-jenkins.eng.vmware.com:8082/4685
Tested-by: gerrit-photon <photon-checkins@vmware.com>
Reviewed-by: Anish Swaminathan <anishs@vmware.com>
Kumar Kaushik authored on 2018/01/25 10:11:33Showing 2 changed files
| ... | ... |
@@ -1,7 +1,7 @@ |
| 1 |
-diff -ru open-vm-tools-stable-10.1.10/open-vm-tools/libDeployPkg/linuxDeployment.c open-vm-tools-stable-10.1.10-modified/open-vm-tools/libDeployPkg/linuxDeployment.c |
|
| 2 |
-+++ open-vm-tools-stable-10.1.10-modified/open-vm-tools/libDeployPkg/linuxDeployment.c 2017-08-22 12:30:18.862037086 -0700 |
|
| 3 |
-@@ -582,13 +582,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,24 +21,22 @@ diff -ru open-vm-tools-stable-10.1.10/open-vm-tools/libDeployPkg/linuxDeployment |
| 21 | 21 |
*archiveType = hdr.payloadType; |
| 22 | 22 |
*flags = hdr.reserved; |
| 23 | 23 |
|
| 24 |
-@@ -1094,6 +1098,20 @@ |
|
| 24 |
+@@ -1190,6 +1194,18 @@ |
|
| 25 |
+ free(command); |
|
| 26 |
+ deployStatus = CloudInitSetup(tmpDirPath); |
|
| 25 | 27 |
} else {
|
| 26 |
- sLog(log_info, "cloud-init is either not installed or the flag to enable \ |
|
| 27 |
- cloud-init is not set.\n Executing traditional GOSC workflow"); |
|
| 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 |
+ |
| 32 | 32 |
+ // The command will be parsed alter and can be of arbitrary length |
| 33 |
-+ command = StrUtil_ReplaceAll(PHOTON_OS_LAUNCH_COMMAND, TMP_PATH_VAR, tmpDirPath); |
|
| 33 |
++ command = strdup(PHOTON_OS_LAUNCH_COMMAND); |
|
| 34 | 34 |
+ if (!command) {
|
| 35 | 35 |
+ SetDeployError("Error allocating memory.");
|
| 36 | 36 |
+ return DEPLOY_ERROR; |
| 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); |
| 43 | 42 |
free(command); |
| 44 |
- |
| ... | ... |
@@ -1,6 +1,6 @@ |
| 1 | 1 |
Summary: Usermode tools for VmWare virts |
| 2 | 2 |
Name: open-vm-tools |
| 3 |
-Version: 10.1.10 |
|
| 3 |
+Version: 10.2.0 |
|
| 4 | 4 |
Release: 1%{?dist}
|
| 5 | 5 |
License: LGPLv2+ |
| 6 | 6 |
URL: https://github.com/vmware/open-vm-tools |
| ... | ... |
@@ -8,7 +8,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=26ac84e86b4c862006b8de7973802e45dfd77464 |
|
| 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 |
| ... | ... |
@@ -113,6 +113,8 @@ fi |
| 113 | 113 |
%{_libdir}/*.so
|
| 114 | 114 |
|
| 115 | 115 |
%changelog |
| 116 |
+* Wed Jan 24 2018 Kumar Kaushik <kaushikk@vmware.com> 10.2.0-1 |
|
| 117 |
+- Updating version to 10.2.0. |
|
| 116 | 118 |
* Tue Aug 22 2017 Kumar Kaushik <kaushikk@vmware.com> 10.1.10-1 |
| 117 | 119 |
- Updating version to 10.1.10, removing upstream patches. |
| 118 | 120 |
* Fri Jun 23 2017 Xiaolin Li <xiaolinl@vmware.com> 10.1.5-6 |