Browse code
fix GOSC return code
Kumar Kaushik authored on 2015/08/21 07:26:03Showing 2 changed files
| 1 | 1 |
new file mode 100644 |
| ... | ... |
@@ -0,0 +1,26 @@ |
| 0 |
+diff -ru gosc-scripts/imc-shell/imgcust-scripts/CustomizationUtils.sh gosc-scripts-2/imc-shell/imgcust-scripts/CustomizationUtils.sh |
|
| 1 |
+--- gosc-scripts/imc-shell/imgcust-scripts/CustomizationUtils.sh 2015-08-19 16:39:55.187036608 -0700 |
|
| 2 |
+@@ -804,7 +804,8 @@ |
|
| 3 |
+ EOF |
|
| 4 |
+ ) |
|
| 5 |
+ |
|
| 6 |
+- securitySshRsa=$(GetOvfPropertyValue 'security.ssh-rsa' $tmpOvfEnvFile) |
|
| 7 |
++# securitySshRsa=$(GetOvfPropertyValue 'security.ssh-rsa' $tmpOvfEnvFile) |
|
| 8 |
++ securitySshRsa='' |
|
| 9 |
+ |
|
| 10 |
+ if [[ -n "$securitySshRsa" ]]; then |
|
| 11 |
+ if [[ "$securitySshRsa" != *ssh-rsa* ]]; then |
|
| 12 |
+diff -ru gosc-scripts/imc-shell/imgcust-scripts/PhotonCustomization.sh gosc-scripts-2/imc-shell/imgcust-scripts/PhotonCustomization.sh |
|
| 13 |
+--- gosc-scripts/imc-shell/imgcust-scripts/PhotonCustomization.sh 2015-08-19 16:39:55.171037246 -0700 |
|
| 14 |
+@@ -53,7 +53,8 @@ |
|
| 15 |
+ # If you don't quote the variable when you echo it, newlines are lost. |
|
| 16 |
+ echo "${content}" > $ciConfigPath
|
|
| 17 |
+ |
|
| 18 |
+- Exec '/usr/bin/cloud-init --file '$ciConfigPath' init' |
|
| 19 |
++# Exec '/usr/bin/cloud-init --file '$ciConfigPath' init' |
|
| 20 |
++ cloud-init --file $ciConfigPath init 2>&1 |
|
| 21 |
+ |
|
| 22 |
+ Exec '/bin/systemctl restart systemd-networkd' '' '' |
|
| 23 |
+ |
| ... | ... |
@@ -1,7 +1,7 @@ |
| 1 | 1 |
Summary: Usermode tools for VmWare virts |
| 2 | 2 |
Name: open-vm-tools |
| 3 | 3 |
Version: 10.0.0 |
| 4 |
-Release: 3%{?dist}
|
|
| 4 |
+Release: 4%{?dist}
|
|
| 5 | 5 |
License: LGPLv2+ |
| 6 | 6 |
URL: https://github.com/vmware/open-vm-tools |
| 7 | 7 |
Group: Applications/System |
| ... | ... |
@@ -14,6 +14,7 @@ Source1: gosc-scripts.tar.gz |
| 14 | 14 |
Patch0: open-vm-tools-service-link.patch |
| 15 | 15 |
Patch1: open-vm-tools-GOSC-photon.patch |
| 16 | 16 |
Patch2: GOSC-VCA.patch |
| 17 |
+Patch3: GOSC-return-code.patch |
|
| 17 | 18 |
BuildRequires: glib-devel |
| 18 | 19 |
BuildRequires: xerces-c-devel |
| 19 | 20 |
BuildRequires: xml-security-c-devel |
| ... | ... |
@@ -38,6 +39,7 @@ VmWare virtualization user mode tools |
| 38 | 38 |
%patch0 -p1 |
| 39 | 39 |
%patch1 -p1 |
| 40 | 40 |
%patch2 -p0 |
| 41 |
+%patch3 -p0 |
|
| 41 | 42 |
%build |
| 42 | 43 |
touch ChangeLog |
| 43 | 44 |
autoreconf -i |
| ... | ... |
@@ -96,6 +98,8 @@ rm -f /sbin/mount.vmhgfs |
| 96 | 96 |
|
| 97 | 97 |
|
| 98 | 98 |
%changelog |
| 99 |
+* Thu Aug 20 2015 Kumar Kaushik <kaushikk@vmware.com> 10.0.0-4 |
|
| 100 |
+- Fixing GOSC-libdeploy return code problem. |
|
| 99 | 101 |
* Thu Aug 13 2015 Kumar Kaushik <kaushikk@vmware.com> 10.0.0-3 |
| 100 | 102 |
- Combining all GOSC patches and adding support for lightwave. |
| 101 | 103 |
* Wed Aug 12 2015 Alexey Makhalov <amakhalov@vmware.com> 10.0.0-2 |