Browse code
Fix the path to cust.cfg in gosc call
Change-Id: Ic6acd8f16582ee2fbff78a89d973e3d3f55d8538
Reviewed-on: http://photon-jenkins.eng.vmware.com:8082/4923
Tested-by: gerrit-photon <photon-checkins@vmware.com>
Reviewed-by: Anish Swaminathan <anishs@vmware.com>
suezzelur authored on 2018/03/22 09:17:49Showing 2 changed files
| ... | ... |
@@ -1,7 +1,7 @@ |
| 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 |
|
| 1 |
+diff -rup 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 | 2 |
--- open-vm-tools-stable-10.2.0/open-vm-tools/libDeployPkg/linuxDeployment.c 2017-12-15 13:11:49.000000000 -0800 |
| 3 |
-+++ open-vm-tools-stable-10.2.0-modified/open-vm-tools/libDeployPkg/linuxDeployment.c 2018-01-24 16:00:02.382004029 -0800 |
|
| 4 |
-@@ -593,13 +593,17 @@ |
|
| 3 |
+@@ -593,13 +593,17 @@ GetPackageInfo(const char* packageName, |
|
| 5 | 4 |
close(fd); |
| 6 | 5 |
|
| 7 | 6 |
// Create space and copy the command |
| ... | ... |
@@ -21,13 +21,14 @@ diff -ru open-vm-tools-stable-10.2.0/open-vm-tools/libDeployPkg/linuxDeployment. |
| 21 | 21 |
*archiveType = hdr.payloadType; |
| 22 | 22 |
*flags = hdr.reserved; |
| 23 | 23 |
|
| 24 |
-@@ -1190,6 +1194,18 @@ |
|
| 24 |
+@@ -1190,6 +1194,19 @@ Deploy(const char* packageName) |
|
| 25 | 25 |
free(command); |
| 26 | 26 |
deployStatus = CloudInitSetup(tmpDirPath); |
| 27 | 27 |
} else {
|
| 28 | 28 |
+ if ((strstr(command, "scripts/Customize.pl") != NULL) || (strstr(command, "scripts/customize.sh") != NULL)) {
|
| 29 | 29 |
+ free (command); |
| 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"; |
|
| 30 |
++ char PHOTON_OS_LAUNCH_COMMAND[256]; |
|
| 31 |
++ sprintf(PHOTON_OS_LAUNCH_COMMAND, "/bin/bash /usr/share/open-vm-tools/GOSC/gosc-scripts/imc-shell/imgcust-scripts/customize.sh %s/cust.cfg", tmpDirPath); |
|
| 31 | 32 |
+ |
| 32 | 33 |
+ // The command will be parsed alter and can be of arbitrary length |
| 33 | 34 |
+ command = strdup(PHOTON_OS_LAUNCH_COMMAND); |
| ... | ... |
@@ -1,7 +1,7 @@ |
| 1 | 1 |
Summary: Usermode tools for VmWare virts |
| 2 | 2 |
Name: open-vm-tools |
| 3 | 3 |
Version: 10.2.0 |
| 4 |
-Release: 1%{?dist}
|
|
| 4 |
+Release: 2%{?dist}
|
|
| 5 | 5 |
License: LGPLv2+ |
| 6 | 6 |
URL: https://github.com/vmware/open-vm-tools |
| 7 | 7 |
Group: Applications/System |
| ... | ... |
@@ -9,8 +9,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 | 11 |
%define sha1 open-vm-tools=adba97493c4f96db6281a6964ee26b17b5adc5c5 |
| 12 |
-Source1: gosc-scripts-1.0.tar.gz |
|
| 13 |
-%define sha1 gosc-scripts-1.0=5031dd9b3b0569a40d2ee0caaa55a1cbf782345e |
|
| 12 |
+Source1: gosc-scripts-1.1.tar.gz |
|
| 13 |
+%define sha1 gosc-scripts-1.1=655ed8832165a60eb2493b8cecf1b26d0c979d2a |
|
| 14 | 14 |
Source2: vmtoolsd.service |
| 15 | 15 |
Source3: vgauthd.service |
| 16 | 16 |
Patch0: IPv6Support.patch |
| ... | ... |
@@ -113,6 +113,8 @@ fi |
| 113 | 113 |
%{_libdir}/*.so
|
| 114 | 114 |
|
| 115 | 115 |
%changelog |
| 116 |
+* Wed Mar 21 2018 Anish Swaminathan <anishs@vmware.com> 10.2.0-2 |
|
| 117 |
+- Fix gosc patch to call customization |
|
| 116 | 118 |
* Wed Jan 24 2018 Kumar Kaushik <kaushikk@vmware.com> 10.2.0-1 |
| 117 | 119 |
- Updating version to 10.2.0. |
| 118 | 120 |
* Tue Aug 22 2017 Kumar Kaushik <kaushikk@vmware.com> 10.1.10-1 |