From 1a2e9866f3d798e3e059003bb8bd845d5b7015b4 Mon Sep 17 00:00:00 2001 From: Andrew Egelhofer Date: Wed, 27 May 2015 16:08:14 -0700 Subject: [PATCH 1/2] This change makes the jenkins-slave RedHat init.d script work with bash < 4.0 --- files/jenkins-slave.RedHat | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/files/jenkins-slave.RedHat b/files/jenkins-slave.RedHat index f8d2adcfd..9ce4da00b 100644 --- a/files/jenkins-slave.RedHat +++ b/files/jenkins-slave.RedHat @@ -37,7 +37,7 @@ slave_start() { # --user in daemon doesn't prepare environment variables like HOME, USER, LOGNAME or USERNAME, # so we let su do so for us now - $RUNUSER - $JENKINS_SLAVE_USER -c "$JAVA $JAVA_ARGS -jar $JENKINS_SLAVE_JAR $JENKINS_SLAVE_ARGS &>> $JENKINS_SLAVE_LOG &" + $RUNUSER - $JENKINS_SLAVE_USER -c "$JAVA $JAVA_ARGS -jar $JENKINS_SLAVE_JAR $JENKINS_SLAVE_ARGS >> $JENKINS_SLAVE_LOG 2>> $JENKINS_SLAVE_LOG &" pgrep -f -u $JENKINS_SLAVE_USER $JENKINS_SLAVE_JAR > $PIDFILE RETVAL=$? [ $RETVAL -eq 0 ] && touch $LOCK_FILE From 9adb229fbe5495a6b12300ca754f45a706c7b223 Mon Sep 17 00:00:00 2001 From: Andrew Egelhofer Date: Thu, 28 May 2015 09:19:38 -0700 Subject: [PATCH 2/2] At the advice of jhoblitt - redirect stdout / stderr this way --- files/jenkins-slave.RedHat | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/files/jenkins-slave.RedHat b/files/jenkins-slave.RedHat index 9ce4da00b..fceb992f3 100644 --- a/files/jenkins-slave.RedHat +++ b/files/jenkins-slave.RedHat @@ -37,7 +37,7 @@ slave_start() { # --user in daemon doesn't prepare environment variables like HOME, USER, LOGNAME or USERNAME, # so we let su do so for us now - $RUNUSER - $JENKINS_SLAVE_USER -c "$JAVA $JAVA_ARGS -jar $JENKINS_SLAVE_JAR $JENKINS_SLAVE_ARGS >> $JENKINS_SLAVE_LOG 2>> $JENKINS_SLAVE_LOG &" + $RUNUSER - $JENKINS_SLAVE_USER -c "$JAVA $JAVA_ARGS -jar $JENKINS_SLAVE_JAR $JENKINS_SLAVE_ARGS >> $JENKINS_SLAVE_LOG 2>&1 &" pgrep -f -u $JENKINS_SLAVE_USER $JENKINS_SLAVE_JAR > $PIDFILE RETVAL=$? [ $RETVAL -eq 0 ] && touch $LOCK_FILE