Browse code
Fix the path to cust.cfg in gosc call
Change-Id: Ib31baee2f59a9a52b1ec191999dd9564ddf022a6
Reviewed-on: http://photon-jenkins.eng.vmware.com:8082/4922
Reviewed-by: Sharath George
Tested-by: Sharath George
suezzelur authored on 2018/03/22 08:47:11Showing 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: 2%{?dist}
|
|
| 4 |
+Release: 3%{?dist}
|
|
| 5 | 5 |
License: LGPLv2+ |
| 6 | 6 |
URL: https://github.com/vmware/open-vm-tools |
| 7 | 7 |
Group: Applications/System |
| ... | ... |
@@ -98,6 +98,8 @@ fi |
| 98 | 98 |
|
| 99 | 99 |
|
| 100 | 100 |
%changelog |
| 101 |
+* Wed Mar 14 2018 Anish Swaminathan <anishs@vmware.com> 10.2.0-3 |
|
| 102 |
+- Fix gosc patch to call customization |
|
| 101 | 103 |
* Wed Mar 14 2018 Anish Swaminathan <anishs@vmware.com> 10.2.0-2 |
| 102 | 104 |
- Fix gosc scripts to take care of multiple network files per interface |
| 103 | 105 |
* Wed Jan 24 2018 Kumar Kaushik <kaushikk@vmware.com> 10.2.0-1 |