[FIXED JENKINS-5020] OpenSUSE init script fix.

jenkinsci · Feb 11, 2011 · 0c19666 · 0c19666
1 parent 24eb579
commit 0c19666
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 25 deletions.
diff --git a/changelog.html b/changelog.html
@@ -67,6 +67,9 @@
   <li class=bug>
     Maven deployment with uniqueVersion == true creating "new" versions for attached artifacts
     (<a href="http://issues.jenkins-ci.org/browse/JENKINS-8651">issue 8651</a>)    
+  <li class=bug>
+    Fixed a bug in the OpenSUSE startup script
+    (<a href="http://issues.jenkins-ci.org/browse/JENKINS-5020">issue 5020</a>)
 </ul>
 </div><!--=TRUNK-END=-->
 

diff --git a/opensuse/SOURCES/jenkins.init.in b/opensuse/SOURCES/jenkins.init.in
@@ -91,35 +91,13 @@ fi
 case "$1" in
     start)
 	echo -n "Starting Jenkins "
-	if /sbin/startproc -l /var/log/jenkins.rc -u "$JENKINS_USER" -p "$JENKINS_PID_FILE" $JAVA_CMD $PARAMS; then
-	    rc_status
-	    # get own session ID
-	    MY_SESSION_ID=`/bin/ps h -o sess -p $$`
-	    # get PID
-	    /bin/ps hww -u hudson -o sess,pid,cmd | grep java | grep -i jenkins | \
-		while read sess pid cmd; do [ "$sess" = $MY_SESSION_ID ] && echo $pid; done | \
-		head -1 > "$JENKINS_PID_FILE"
-	else
-	    rc_failed 1
-	fi
+	JPID=`/sbin/startproc -v -s -l /var/log/jenkins.rc -u "$JENKINS_USER" -p "$JENKINS_PID_FILE" $JAVA_CMD $PARAMS`
 	rc_status -v
+	[ -s "$JENKINS_PID_FILE" ] || echo $JPID >"$JENKINS_PID_FILE"
 	;;
     stop)
 	echo -n "Shutting down Jenkins "
-	PID=`cat "$JENKINS_PID_FILE" 2>/dev/null`
-	if [ -n "$PID" ]; then
-	    if /bin/kill -0 "$PID"; then
-		# process exists
-		/bin/kill -INT "$PID"
-		rc=$?
-		[ "$rc" = "0" ] && /bin/rm -f "$JENKINS_PID_FILE"
-		rc_failed "$rc"
-	    else
-		rc_failed 7
-	    fi
-	else
-	    rc_failed 1
-	fi
+	/sbin/killproc -p "$JENKINS_PID_FILE" $JAVA_HOME/bin/java
 	rc_status -v
 	;;
     try-restart|condrestart)