From: Timoney, Dan (dt5972) <dt5972@att.com>
Date: Tue, 13 Mar 2018 18:43:44 +0000 (-0400)
Subject: Wait on termination of java process
X-Git-Tag: v0.2.1~15
X-Git-Url: https://gerrit.onap.org/r/gitweb?p=ccsdk%2Fdistribution.git;a=commitdiff_plain;h=7448501933cc7e99665c49a002563061ad800f5d;hp=a16cced961d7d298ae3cc8ede231546e6b2f98c1

Wait on termination of java process

Exec of client didn't work - docker container still dies at end of script.
Trying instead to wait on death of java process.

Change-Id: I5687ca46b55b13a4918b0be1e2204abf58ca43b2
Issue-ID: CCSDK-208
Signed-off-by: Timoney, Dan (dt5972) <dt5972@att.com>
---

diff --git a/odlsli/src/main/scripts/startODL.sh b/odlsli/src/main/scripts/startODL.sh
index 5ca40796..3e528216 100644
--- a/odlsli/src/main/scripts/startODL.sh
+++ b/odlsli/src/main/scripts/startODL.sh
@@ -63,5 +63,6 @@ then
     echo "Installed at `date`" > ${CCSDK_HOME}/.installed
 fi
 
-# Start client to force a wait on state of karaf server
-exec ${ODL_HOME}/bin/client
+# Wait on java
+pid=$(ps auxwww | grep java | grep -v grep | awk '{print $2}')
+exec tail --pid=$pid -f /dev/null