From 3df2faa7dd31c9a2c21e6421a89f274ae725cba2 Mon Sep 17 00:00:00 2001
From: Kevin Kluge <kevin@cloud.com>
Date: Thu, 13 Jan 2011 22:41:41 -0800
Subject: [PATCH 1/2] update ssvm-check for the new command line params

---
 console-proxy/scripts/ssvm-check.sh | 16 ++--------------
 1 file changed, 2 insertions(+), 14 deletions(-)

diff --git a/console-proxy/scripts/ssvm-check.sh b/console-proxy/scripts/ssvm-check.sh
index b4e8cb4d3bb..8bd0ae50112 100644
--- a/console-proxy/scripts/ssvm-check.sh
+++ b/console-proxy/scripts/ssvm-check.sh
@@ -6,8 +6,6 @@
 # /proc/cmdline can have a different number of arguments depending on whether or not a second
 # DNS server is specified.
 
-grep dns2 /proc/cmdline 1> /dev/null 2>&1
-HAVEDNS2=$?
 
 # ping dns server
 echo ================================================
@@ -61,12 +59,7 @@ then
 else
     echo "ERROR: NFS is not currently mounted"
     echo "Try manually mounting from inside the VM"
-    if [ $HAVEDNS2 -eq 0 ]
-    then
-	NFSSERVER=`awk '{print $24}' /proc/cmdline|awk -F= '{print $2}'|awk -F: '{print $1}'`
-    else
-	NFSSERVER=`awk '{print $23}' /proc/cmdline|awk -F= '{print $2}'|awk -F: '{print $1}'`
-    fi
+    NFSSERVER=`awk '{print $17}' /proc/cmdline|awk -F= '{print $2}'|awk -F: '{print $1}'`
     echo "NFS server is " $NFSSERVER
     ping -c 2 -w 2 $NFSSERVER
     if [ $? -eq 0 ]
@@ -82,12 +75,7 @@ fi
 
 # check for connectivity to the management server
 echo ================================================
-if [ $HAVEDNS2 -eq 0 ]
-then
-    MGMTSERVER=`awk '{print $21}' /proc/cmdline | awk -F= '{print $2}'`
-else
-    MGMTSERVER=`awk '{print $20}' /proc/cmdline | awk -F= '{print $2}'`
-fi
+MGMTSERVER=`awk '{print $12}' /proc/cmdline | awk -F= '{print $2}'`
 echo Management server is $MGMTSERVER.  Checking connectivity.
 socatout=$(echo | socat - TCP:$MGMTSERVER:8250,connect-timeout=3 2>&1)
 if [ $? -eq 0 ]

From 8f506078e228683dcaeacafd1aff17a428e93674 Mon Sep 17 00:00:00 2001
From: Kevin Kluge <kevin@cloud.com>
Date: Thu, 13 Jan 2011 23:02:51 -0800
Subject: [PATCH 2/2] bug 7908 resolved fixed. changed heap to 256 MB and
 permgen to 128 MB.

---
 client/tomcatconf/tomcat6.conf.in | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/client/tomcatconf/tomcat6.conf.in b/client/tomcatconf/tomcat6.conf.in
index 83b3be702f8..071ea33478b 100644
--- a/client/tomcatconf/tomcat6.conf.in
+++ b/client/tomcatconf/tomcat6.conf.in
@@ -24,7 +24,7 @@ CATALINA_TMPDIR="@MSENVIRON@/temp"
 
 # Use JAVA_OPTS to set java.library.path for libtcnative.so
 #JAVA_OPTS="-Djava.library.path=/usr/lib64"
-JAVA_OPTS="-Djava.awt.headless=true -Xmx128M -XX:+HeapDumpOnOutOfMemoryError -XX:HeapDumpPath=@MSLOGDIR@"
+JAVA_OPTS="-Djava.awt.headless=true -Xmx256M -XX:+HeapDumpOnOutOfMemoryError -XX:HeapDumpPath=@MSLOGDIR@ -XX:PermSize=128M"
 
 # What user should run tomcat
 TOMCAT_USER="@MSUSER@"