Synched up 2.7 branch with trunk for xCAT-UI and zVM plugin.

git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/branches/2.7@12529 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd

xCAT-server/share/xcat/install/scripts/post.rhel5.s390x

@@ -13,7 +13,7 @@ RAND=$(perl -e 'print int(rand(50)). "\n"')
 sleep $RAND
 
 # Loop through the master/service nodes
-for i in $(seq 1 20)
+for t in $(seq 1 20)
 do
 	GOTIT=0
 	for i in $MASTER_IPS
@@ -141,4 +141,4 @@ echo "$TMP" > /tmp/mypostscript
 /tmp/mypostscript
 
 # Master/service node variable set by nodeset
-updateflag.awk replace_master 3002
+updateflag.awk replace_master 3002

xCAT-server/share/xcat/install/scripts/post.rhel6.s390x

@@ -13,7 +13,7 @@ RAND=$(perl -e 'print int(rand(50)). "\n"')
 sleep $RAND
 
 # Loop through the master/service nodes
-for i in $(seq 1 20)
+for j in $(seq 1 20)
 do
 	GOTIT=0
 	for i in $MASTER_IPS
@@ -144,4 +144,4 @@ echo "$TMP" > /tmp/mypostscript
 updateflag.awk replace_master 3002
 
 # Restore default SELinux security context
-restorecon -R -v /root/.ssh
+restorecon -R -v /root/.ssh

xCAT-server/share/xcat/install/scripts/post.sles10.s390x

@@ -23,7 +23,7 @@ HOSTNAME=$(hostname -s)
 # These variables are set by nodeset
 export MASTER_IPS=( replace_master )
 
-for i in $(seq 1 20)
+for t in $(seq 1 20)
 do
 	GOTIT=0
 	

xCAT-server/share/xcat/install/scripts/post.sles11.s390x

@@ -19,7 +19,7 @@ HOSTNAME=$(hostname -s)
 # These variables are set by nodeset
 export MASTER_IPS=( replace_master )
 
-for i in $(seq 1 20)
+for t in $(seq 1 20)
 do
 	GOTIT=0