Browse code

GOSC lightwave support

Kumar Kaushik authored on 2015/09/12 09:03:03
Showing 2 changed files
1 1
new file mode 100644
... ...
@@ -0,0 +1,60 @@
0
+diff -ru gosc-scripts/imc-shell/imgcust-scripts/ConfigFile.sh gosc-scripts-modify/imc-shell/imgcust-scripts/ConfigFile.sh
1
+--- gosc-scripts/imc-shell/imgcust-scripts/ConfigFile.sh	2015-09-11 12:51:24.157078000 -0700
2
+@@ -610,6 +610,19 @@
3
+   echo "$val"
4
+ }
5
+ 
6
++# Retrieves Lightwave PSE Contoller IP.
7
++#
8
++# Args:
9
++#   None
10
++# Results:
11
++#   string: PSE Controller IP or empty string in case it's missing or empty
12
++# Throws:
13
++#   None
14
++ConfigFile_GetLWDOMAINIP()
15
++{
16
++  echo "$(ConfigFile_GetOptionalString 'LIGHTWAVE|DOMAINIP')"
17
++}
18
++
19
+ # Retrieves Lightwave DNS1 IP.
20
+ #
21
+ # Args:
22
+diff -ru gosc-scripts/imc-shell/imgcust-scripts/CustomizationUtils.sh gosc-scripts-modify/imc-shell/imgcust-scripts/CustomizationUtils.sh
23
+--- gosc-scripts/imc-shell/imgcust-scripts/CustomizationUtils.sh	2015-09-11 12:51:24.157078000 -0700
24
+@@ -687,6 +687,7 @@
25
+   local lw_dns2=$(ConfigFile_GetLWDNS2)
26
+   local lw_dns3=$(ConfigFile_GetLWDNS3)
27
+   local query_string=''
28
++  local lwdomain_ip=$(ConfigFile_GetLWDOMAINIP)
29
+   
30
+   Debug "DNS1 $lw_dns1"
31
+   Debug "DNS2 $lw_dns2"
32
+@@ -703,6 +704,12 @@
33
+   local domain_name=$(ConfigFile_GetLWDomain)
34
+   local user_name=$(ConfigFile_GetLWDomainUserName)
35
+   local password=$(ConfigFile_GetLWDomainPwd)
36
++
37
++  if [[ -n "$domain_name" ]] && [[ -n "$lwdomain_ip" ]]; then
38
++    local patch_info="$lwdomain_ip    $domain_name"
39
++    echo "$patch_info" >> /etc/hosts
40
++  fi  
41
++  
42
+   
43
+   # default username is administrator, we will overwrite it if other username is specified 
44
+   
45
+@@ -729,8 +736,11 @@
46
+     if [[ -n "$optional" ]]; then
47
+       execute="$execute $optional"
48
+     fi
49
++    # sometime vmafd is not running by default, so restarting it.
50
++    Exec "/opt/likewise/bin/lwsm restart vmafd"   
51
++
52
+     Debug "Going to execute $execute"
53
+-    $execute    
54
++    Exec "$execute"    
55
+     Debug "Light wave domain join procedure completed"
56
+   else
57
+     Debug "ERROR :: Either Domain Name or Password Missing: Cannot Join Lighwave domain"
... ...
@@ -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:	9%{?dist}
4
+Release:	10%{?dist}
5 5
 License:	LGPLv2+
6 6
 URL:		https://github.com/vmware/open-vm-tools
7 7
 Group:		Applications/System
... ...
@@ -18,6 +18,7 @@ Patch3:         GOSC-return-code.patch
18 18
 Patch4:         GOSC-NFS-MOUNT.patch
19 19
 Patch5:         skipreboot.patch
20 20
 Patch6:         GOSC-counterBug.patch
21
+Patch7:         LighwaveHostPatch.patch
21 22
 BuildRequires: 	glib-devel
22 23
 BuildRequires: 	xerces-c-devel
23 24
 BuildRequires: 	xml-security-c-devel
... ...
@@ -46,6 +47,7 @@ VmWare virtualization user mode tools
46 46
 %patch4 -p0
47 47
 %patch5 -p1
48 48
 %patch6 -p0
49
+%patch7 -p0
49 50
 %build
50 51
 touch ChangeLog
51 52
 autoreconf -i
... ...
@@ -105,6 +107,8 @@ rm -f /sbin/mount.vmhgfs
105 105
 
106 106
 
107 107
 %changelog
108
+*       Wed Sep 09 2015 Kumar Kaushik <kaushikk@vmware.com> 10.0.0-10
109
+-       Adding option to modify /etc/hosts for lightwave on optional basis.
108 110
 *       Wed Sep 09 2015 Kumar Kaushik <kaushikk@vmware.com> 10.0.0-9
109 111
 -       Fixing once in while issue related to customization failure.
110 112
 *       Wed Sep 02 2015 Kumar Kaushik <kaushikk@vmware.com> 10.0.0-8