From 5edfaad69c4cde743ea18d81121e6394a5586dd5 Mon Sep 17 00:00:00 2001
From: Holger Levsen <holger@layer-acht.org>
Date: Thu, 15 Sep 2016 08:38:15 +0200
Subject: merge change from jenkins 2.7.4

---
 hosts/jenkins/etc/init.d/jenkins | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'hosts/jenkins/etc')

diff --git a/hosts/jenkins/etc/init.d/jenkins b/hosts/jenkins/etc/init.d/jenkins
index 4b266c45..51783a81 100755
--- a/hosts/jenkins/etc/init.d/jenkins
+++ b/hosts/jenkins/etc/init.d/jenkins
@@ -134,7 +134,7 @@ do_start()
 # 
 get_running() 
 {
-    return `ps -U $JENKINS_USER --no-headers -f | egrep -e '(java|daemon)' | grep -c . `
+    return `ps -U $JENKINS_USER --no-headers -f | egrep -e '(java)' | grep -v defunct | grep -c . `
 }
 
 force_stop() 
-- 
cgit v1.2.3-70-g09d2