Fix broken openSUSE init script (again).

changelog.html

@@ -82,6 +82,9 @@ Upcoming changes</a>
   <li class=bug>
     Fixed a log rotation configuration problem on openSUSE.
     (<a href="http://issues.jenkins-ci.org/browse/JENKINS-5784">issue 5784</a>)
+  <li class=bug>
+    Fixed a bug in the OpenSUSE startup script (again)
+    (<a href="http://issues.jenkins-ci.org/browse/JENKINS-5020">issue 5020</a>)
   <li class=rfe>
     Change prefix of BUILD_TAG variable to "jenkins-"
   <li class=rfe>

opensuse/SOURCES/jenkins.init.in

@@ -90,13 +90,27 @@ fi
 case "$1" in
     start)
 	echo -n "Starting Jenkins "
-	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"
+        /sbin/checkproc -k -p "$JENKINS_PID_FILE" "$JAVA_HOME/bin/java" >/var/log/jenkins.rc 2>&1
+        CHECK=$?
+        if [ $CHECK -eq 7 ]; then
+                rm -f "$JENKINS_PID_FILE"
+                startproc -s -l /var/log/jenkins.rc -u "$JENKINS_USER" -p "$JENKINS_PID_FILE" $JAVA_CMD $PARAMS
+                JPROC=$( find /proc -maxdepth 2 -user jenkins -name exe -lname "*/bin/java" )
+                if [ -n "$JPROC" ]; then
+                        basename `dirname $JPROC` >"$JENKINS_PID_FILE"
+                        rc_status -v
+                else
+                        rc_failed
+                        rc_status -v
+                fi
+        else
+                rc_failed $CHECK
+                rc_status -v
+        fi
 	;;
     stop)
 	echo -n "Shutting down Jenkins "
-	/sbin/killproc -p "$JENKINS_PID_FILE" $JAVA_HOME/bin/java
+	/sbin/killproc -p "$JENKINS_PID_FILE" "$JAVA_HOME/bin/java"
 	rc_status -v
 	;;
     try-restart|condrestart)