commit 38d2977ad4dd644defbbe7fd59032381b4e23490
author Jordan Halterman <jordan@opennetworking.org> Tue Jul 10 17:57:45 2018 -0700
committer Thomas Vachuska <tom@opennetworking.org> Wed Jul 11 03:05:03 2018 +0000
tree 53225cbe9ba4a9c3580b4e102b795fbafa5c8429
parent feb271729817682669cadad809ce3b1cda8b2093

Append lock timeout to existing JAVA_OPTS to avoid overwriting user options

Change-Id: Ida423626d77a9782cf281683e55e91c6433bea44

tools/package/bin/onos-service

diff --git a/tools/package/bin/onos-service b/tools/package/bin/onos-service
index f1320a8..ad61f34 100755
--- a/tools/package/bin/onos-service
+++ b/tools/package/bin/onos-service
@@ -10,7 +10,7 @@
 # Do modify the keystore location/password and truststore location/password accordingly
 #export JAVA_OPTS="${JAVA_OPTS:--DenableNettyTLS=true -Djavax.net.ssl.keyStore=/home/ubuntu/onos.jks -Djavax.net.ssl.keyStorePassword=222222 -Djavax.net.ssl.trustStore=/home/ubuntu/onos.jks -Djavax.net.ssl.trustStorePassword=222222}"
 
-export JAVA_OPTS=-Dds.lock.timeout.milliseconds=10000
+export JAVA_OPTS="${JAVA_OPTS:--Dds.lock.timeout.milliseconds=10000}"
 
 set -e  # exit on error
 set -u  # exit on undefined variable