Browse code
Avoiding recustomization of hostname, bug 1678537
Change-Id: I3fb0a25320446a1aa24c7dd0e30f03232f9a7af1
Reviewed-on: http://photon-jenkins.eng.vmware.com/1118
Tested-by: jenkins-photon <wangnan2015@hotmail.com>
Reviewed-by: suezzelur <anishs@vmware.com>
(cherry picked from commit 1f46899d8f2e7fcf2d38b2818af5fa98cdf55216)
Reviewed-on: http://photon-jenkins.eng.vmware.com/1126
Tested-by: suezzelur <anishs@vmware.com>
Kumar Kaushik authored on 2016/06/24 10:22:08Showing 2 changed files
| 1 | 1 |
new file mode 100644 |
| ... | ... |
@@ -0,0 +1,11 @@ |
| 0 |
+diff -ru gosc-scripts/imc-shell/imgcust-scripts/PhotonCustomization.sh gosc-scripts-modified/imc-shell/imgcust-scripts/PhotonCustomization.sh |
|
| 1 |
+--- gosc-scripts/imc-shell/imgcust-scripts/PhotonCustomization.sh 2016-04-29 14:10:39.000000000 -0700 |
|
| 2 |
+@@ -45,6 +45,7 @@ |
|
| 3 |
+ |
|
| 4 |
+ sleep 2 |
|
| 5 |
+ rm -rf /var/lib/cloud/instance* |
|
| 6 |
++ rm -rf /var/lib/cloud/seed |
|
| 7 |
+ |
|
| 8 |
+ GenerateCloudInitConfig content "GetInterfaceByMacAddressIPAddrShow" $tmpOvfEnvFile |
|
| 9 |
+ # Once the cloud-config file been generated, remove the existing network config files. |
| ... | ... |
@@ -1,7 +1,7 @@ |
| 1 | 1 |
Summary: Usermode tools for VmWare virts |
| 2 | 2 |
Name: open-vm-tools |
| 3 | 3 |
Version: 10.0.5 |
| 4 |
-Release: 11%{?dist}
|
|
| 4 |
+Release: 12%{?dist}
|
|
| 5 | 5 |
License: LGPLv2+ |
| 6 | 6 |
URL: https://github.com/vmware/open-vm-tools |
| 7 | 7 |
Group: Applications/System |
| ... | ... |
@@ -16,6 +16,7 @@ Source3: vgauthd.service |
| 16 | 16 |
Patch0: open-vm-tools-service-link.patch |
| 17 | 17 |
Patch1: GOSC-libDeploy.patch |
| 18 | 18 |
Patch2: IPv6Support.patch |
| 19 |
+Patch3: hostnameReCustomizationFix.patch |
|
| 19 | 20 |
BuildRequires: glib-devel |
| 20 | 21 |
BuildRequires: xerces-c-devel |
| 21 | 22 |
BuildRequires: xml-security-c-devel |
| ... | ... |
@@ -42,6 +43,7 @@ VmWare virtualization user mode tools |
| 42 | 42 |
%patch0 -p1 |
| 43 | 43 |
%patch1 -p1 |
| 44 | 44 |
%patch2 -p0 |
| 45 |
+%patch3 -p0 |
|
| 45 | 46 |
%build |
| 46 | 47 |
touch ChangeLog |
| 47 | 48 |
autoreconf -i |
| ... | ... |
@@ -99,6 +101,8 @@ fi |
| 99 | 99 |
|
| 100 | 100 |
|
| 101 | 101 |
%changelog |
| 102 |
+* Thu Jun 23 2016 Kumar Kaushik <kaushikk@vmware.com> 10.0.5-12 |
|
| 103 |
+- Avoiding recustomization of hostname, bug#1678537. |
|
| 102 | 104 |
* Mon Jun 13 2016 Kumar Kaushik <kaushikk@vmware.com> 10.0.5-11 |
| 103 | 105 |
- Adding IPv6 Support for VCHA in customization. |
| 104 | 106 |
* Tue May 24 2016 Priyesh Padmavilasom <ppadmavilasom@vmware.com> 10.0.5-10 |