Browse code
Adding IPv6 support in customization try2 Bug:1672634
Change-Id: I0bd9fc7d4edc5cbaa55919d41c97cf18d5cee3e3
Reviewed-on: http://photon-jenkins.eng.vmware.com/1076
Tested-by: jenkins-photon <wangnan2015@hotmail.com>
Reviewed-by: Sharath George
(cherry picked from commit 8abc50ea2d68b57c7c8760fda7e6e9dfe72998c0)
Reviewed-on: http://photon-jenkins.eng.vmware.com/1093
Reviewed-by: suezzelur <anishs@vmware.com>
Tested-by: suezzelur <anishs@vmware.com>
Kumar Kaushik authored on 2016/06/15 05:55:19Showing 2 changed files
| 1 | 1 |
new file mode 100644 |
| ... | ... |
@@ -0,0 +1,98 @@ |
| 0 |
+diff -ru gosc-scripts/imc-shell/imgcust-scripts/CustomizationUtils.sh gosc-scripts-modified/imc-shell/imgcust-scripts/CustomizationUtils.sh |
|
| 1 |
+--- gosc-scripts/imc-shell/imgcust-scripts/CustomizationUtils.sh 2016-04-29 15:41:27.000000000 -0700 |
|
| 2 |
+@@ -931,9 +931,8 @@ |
|
| 3 |
+ local i= |
|
| 4 |
+ for i in $(seq 1 $nicsCnt); do |
|
| 5 |
+ local nic=$(ConfigFile_GetNicByIndex $i) |
|
| 6 |
+- local bootProto=$(ConfigFile_GetBootProto $nic) |
|
| 7 |
+ local mac=$(ConfigFile_GetMacAddress $nic) |
|
| 8 |
+- |
|
| 9 |
++ local ipv4Addr=$(ConfigFile_GetFirstIpV4Addr $nic) |
|
| 10 |
+ local ifCfg= |
|
| 11 |
+ ${addrShowVar} ${mac} "" ifCfg
|
|
| 12 |
+ Debug "ifCfg: $ifCfg" |
|
| 13 |
+@@ -951,56 +950,60 @@ |
|
| 14 |
+ [Network] |
|
| 15 |
+ EOF |
|
| 16 |
+ ) |
|
| 17 |
+- |
|
| 18 |
+- if [[ $bootProto == "dhcp" ]]; then |
|
| 19 |
++ # Configure the DHCP IP settings |
|
| 20 |
++ if [ -z "$ipv4Addr" ]; then |
|
| 21 |
+ export formatResult=$formatResult$(${CAT} <<EOF
|
|
| 22 |
+ |
|
| 23 |
+ DHCP=yes |
|
| 24 |
+ EOF |
|
| 25 |
+ ) |
|
| 26 |
+- else # static |
|
| 27 |
+- ipv4Addr=$(ConfigFile_GetFirstIpV4Addr $nic) |
|
| 28 |
++ else |
|
| 29 |
++ export formatResult=$formatResult$(${CAT} <<EOF
|
|
| 30 |
++ |
|
| 31 |
++ DHCP=ipv6 |
|
| 32 |
++EOF |
|
| 33 |
++) |
|
| 34 |
++ fi |
|
| 35 |
++ # Configure Static IP setting |
|
| 36 |
++ if [ -n "$ipv4Addr" ]; then |
|
| 37 |
+ ipv4Mask=$(ConfigFile_GetFirstIpV4Mask $nic) |
|
| 38 |
+ ipv4Gw=$(ConfigFile_GetFirstIpV4Gw $nic) |
|
| 39 |
+ local gatewayStr="Gateway=$ipv4Gw" |
|
| 40 |
+ if [ "$ipv4Gw" = "0.0.0.0" ] |
|
| 41 |
+ then |
|
| 42 |
+- Debug "Found an empty gateway" |
|
| 43 |
+- gatewayStr="" |
|
| 44 |
++ Debug "Found an empty gateway" |
|
| 45 |
++ gatewayStr="" |
|
| 46 |
+ fi |
|
| 47 |
+ ipv4AddrPrefix=$(MaskStrToBits "$ipv4Addr $ipv4Mask") |
|
| 48 |
+- |
|
| 49 |
+ export formatResult=$formatResult$(${CAT} <<EOF
|
|
| 50 |
+ |
|
| 51 |
+ Address=$ipv4AddrPrefix |
|
| 52 |
+ $gatewayStr |
|
| 53 |
+ EOF |
|
| 54 |
+ ) |
|
| 55 |
+- ipv6Cnt=$(ConfigFile_GetIpV6Cnt $nic) |
|
| 56 |
+- local j= |
|
| 57 |
+- for j in $(seq 1 $ipv6Cnt); do |
|
| 58 |
+- ipv6Addr=$(ConfigFile_GetIpV6AddrByInd $nic $j) |
|
| 59 |
+- ipv6Pref=$(ConfigFile_GetIpV6PrefixByInd $nic $j) |
|
| 60 |
+- |
|
| 61 |
+- export formatResult=$formatResult$(${CAT} <<EOF
|
|
| 62 |
++ fi |
|
| 63 |
++ local ipv6Cnt=$(ConfigFile_GetIpV6Cnt $nic) |
|
| 64 |
++ local j= |
|
| 65 |
++ for j in $(seq 1 $ipv6Cnt); do |
|
| 66 |
++ ipv6Addr=$(ConfigFile_GetIpV6AddrByInd $nic $j) |
|
| 67 |
++ ipv6Pref=$(ConfigFile_GetIpV6PrefixByInd $nic $j) |
|
| 68 |
++ export formatResult=$formatResult$(${CAT} <<EOF
|
|
| 69 |
+ |
|
| 70 |
+ Address=$ipv6Addr/$ipv6Pref |
|
| 71 |
+ EOF |
|
| 72 |
+ ) |
|
| 73 |
+- done |
|
| 74 |
++ done |
|
| 75 |
+ |
|
| 76 |
+- ipv6GwCnt=$(ConfigFile_GetIpV6GwCnt $nic) |
|
| 77 |
+- local j= |
|
| 78 |
+- for j in $(seq 1 $ipv6GwCnt); do |
|
| 79 |
+- ipv6Gw=$(ConfigFile_GetIpV6GwByInd $nic $j) |
|
| 80 |
+- |
|
| 81 |
+- export formatResult=$formatResult$(${CAT} <<EOF
|
|
| 82 |
++ ipv6GwCnt=$(ConfigFile_GetIpV6GwCnt $nic) |
|
| 83 |
++ local j= |
|
| 84 |
++ for j in $(seq 1 $ipv6GwCnt); do |
|
| 85 |
++ ipv6Gw=$(ConfigFile_GetIpV6GwByInd $nic $j) |
|
| 86 |
++ export formatResult=$formatResult$(${CAT} <<EOF
|
|
| 87 |
+ |
|
| 88 |
+ Gateway=$ipv6Gw |
|
| 89 |
+ EOF |
|
| 90 |
+ ) |
|
| 91 |
+- done |
|
| 92 |
+- fi # boot proto |
|
| 93 |
++ done |
|
| 94 |
+ |
|
| 95 |
+ local dnsCnt=$(ConfigFile_GetNameServersCnt) |
|
| 96 |
+ for j in $(seq 1 $dnsCnt); do |
| ... | ... |
@@ -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: 10%{?dist}
|
|
| 4 |
+Release: 11%{?dist}
|
|
| 5 | 5 |
License: LGPLv2+ |
| 6 | 6 |
URL: https://github.com/vmware/open-vm-tools |
| 7 | 7 |
Group: Applications/System |
| ... | ... |
@@ -15,6 +15,7 @@ Source2: vmtoolsd.service |
| 15 | 15 |
Source3: vgauthd.service |
| 16 | 16 |
Patch0: open-vm-tools-service-link.patch |
| 17 | 17 |
Patch1: GOSC-libDeploy.patch |
| 18 |
+Patch2: IPv6Support.patch |
|
| 18 | 19 |
BuildRequires: glib-devel |
| 19 | 20 |
BuildRequires: xerces-c-devel |
| 20 | 21 |
BuildRequires: xml-security-c-devel |
| ... | ... |
@@ -40,6 +41,7 @@ VmWare virtualization user mode tools |
| 40 | 40 |
%setup -a 1 |
| 41 | 41 |
%patch0 -p1 |
| 42 | 42 |
%patch1 -p1 |
| 43 |
+%patch2 -p0 |
|
| 43 | 44 |
%build |
| 44 | 45 |
touch ChangeLog |
| 45 | 46 |
autoreconf -i |
| ... | ... |
@@ -97,6 +99,8 @@ fi |
| 97 | 97 |
|
| 98 | 98 |
|
| 99 | 99 |
%changelog |
| 100 |
+* Mon Jun 13 2016 Kumar Kaushik <kaushikk@vmware.com> 10.0.5-11 |
|
| 101 |
+- Adding IPv6 Support for VCHA in customization. |
|
| 100 | 102 |
* Tue May 24 2016 Priyesh Padmavilasom <ppadmavilasom@vmware.com> 10.0.5-10 |
| 101 | 103 |
- GA - Bump release of all rpms |
| 102 | 104 |
* Wed May 04 2016 Anish Swaminathan <anishs@vmware.com> 10.0.5-9 |