Merge branch 'release-19.0.0' of github.com:OpenNMS/opennms into rele…

…ase-19.0.0

opennms-assemblies/minion/src/main/filtered/etc/minion.init

@@ -82,10 +82,6 @@ JAVA_OPTS="$JAVA_OPTS -XX:+HeapDumpOnOutOfMemoryError"
 # export any default configurable variables from sysconf
 export JAVA_HOME JAVA_MIN_MEM JAVA_MAX_MEM MAX_FD JAVA JAVA_DEBUG_OPTS JAVA_DEBUG_PORT JAVA_OPTS CLASSPATH KARAF_DEBUG LD_LIBRARY_PATH
 
-is_running() {
-	"$MINION_HOME"/bin/status >/dev/null 2>&1
-}
-
 get_root_pid() {
 	ROOT_INSTANCE_PID=0
 	if [ -f "${MINION_HOME}/instances/instance.properties" ];
@@ -95,6 +91,15 @@ get_root_pid() {
 	echo "$ROOT_INSTANCE_PID"
 }
 
+is_running() {
+  PID=$(get_root_pid)
+  if [ "${PID}" -ne "0" ] && ps p "$PID" > /dev/null; then
+    return 0
+  else
+    return 1
+  fi
+}
+
 stop_minion() {
 	"$MINION_HOME"/bin/stop >/dev/null
 }