diff options
| author | Shireesh Anjal <shireesh@gluster.com> | 2011-07-30 21:34:14 +0530 |
|---|---|---|
| committer | Shireesh Anjal <shireesh@gluster.com> | 2011-07-30 21:34:14 +0530 |
| commit | 557d6406768da9362ee08e49217fd9ec4744475a (patch) | |
| tree | 89ace730807015fe110f600ad46db5d195398ff6 | |
| parent | 5dc3f7b2da4b16806dddd3d4a1635ca10c9a9042 (diff) | |
| parent | 4b65549dee71790c9ed505f1a8a9ae75aca0e664 (diff) | |
Merge branch 'work'
| -rw-r--r-- | build/glustermg.spec | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/build/glustermg.spec b/build/glustermg.spec index cad7c2da..c4c4e4cb 100644 --- a/build/glustermg.spec +++ b/build/glustermg.spec @@ -61,7 +61,7 @@ if ! grep -q JAVA_HOME /etc/sysconfig/tomcat5; then echo JAVA_HOME=/usr/lib/jvm/java-1.6.0-openjdk-1.6.0.0.x86_64 >> /etc/sysconfig/tomcat5 fi if ! grep -q JAVA_OPTS /etc/sysconfig/tomcat5; then - echo 'JAVA_OPTS="-Xms1024m -Xmx1024m -XX:PermSize=256m -XX:MaxPermSize=256m"' >> /etc/sysconfig/tomcat5 + echo 'JAVA_OPTS="${JAVA_OPTS} -Xms1024m -Xmx1024m -XX:PermSize=256m -XX:MaxPermSize=256m"' >> /etc/sysconfig/tomcat5 fi if ! grep /usr/share/tomcat5/webapps/glustermg/ssl/gmg-ssl.keystore /usr/share/tomcat5/conf/server.xml; then cat >> /usr/share/tomcat5/conf/server.xml <<EOF |