Repository: trafficserver Updated Branches: refs/heads/master 713bc014c -> 847d5c61a
Fix OS X startup script on Yosemite On earier OS X version, running "launchctl submit" as root was sufficient to push a job into the system bootstrap session. On Yosemite (10.10), however we have to bsexeec it. This ought to also work on earlier releases, but that's untested. Project: http://git-wip-us.apache.org/repos/asf/trafficserver/repo Commit: http://git-wip-us.apache.org/repos/asf/trafficserver/commit/847d5c61 Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/847d5c61 Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/847d5c61 Branch: refs/heads/master Commit: 847d5c61a7fe1a85edf6324328fe83e58094f7cb Parents: 713bc01 Author: James Peach <[email protected]> Authored: Tue Oct 28 10:57:21 2014 -0700 Committer: James Peach <[email protected]> Committed: Wed Oct 29 13:02:13 2014 -0700 ---------------------------------------------------------------------- rc/trafficserver.in | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/trafficserver/blob/847d5c61/rc/trafficserver.in ---------------------------------------------------------------------- diff --git a/rc/trafficserver.in b/rc/trafficserver.in index 5f0c5f7..eacd6b0 100644 --- a/rc/trafficserver.in +++ b/rc/trafficserver.in @@ -279,8 +279,8 @@ case "$1" in rc_status -v elif [ "$DISTRIB_ID" = "Darwin" ]; then echo "Starting ${TS_PACKAGE_NAME}" - launchctl list $TC_NAME > /dev/null 2>&1 && exit 0 - launchctl submit -l $TC_NAME -p $TC_DAEMON -o $STDOUTLOG -e $STDERRLOG -- $TC_DAEMON_ARGS + launchctl bsexec / list $TC_NAME > /dev/null 2>&1 && exit 0 + launchctl bsexec / submit -l $TC_NAME -p $TC_DAEMON -o $STDOUTLOG -e $STDERRLOG -- $TC_DAEMON_ARGS elif [ "$DISTRIB_ID" = "FreeBSD" ]; then echo "Starting ${TS_PACKAGE_NAME}" name="$TC_NAME" @@ -317,9 +317,9 @@ case "$1" in rc_status -v elif [ "$DISTRIB_ID" = "Darwin" ]; then echo "Stopping ${TS_PACKAGE_NAME}" - launchctl list $TC_NAME > /dev/null 2>&1 || exit 0 + launchctl bsexec / list $TC_NAME > /dev/null 2>&1 || exit 0 echo "Stopping ${TC_NAME}" - launchctl remove ${TC_NAME} + launchctl bsexec / remove ${TC_NAME} rm -f ${TC_PIDFILE} echo "Stopping ${TM_NAME}" kill $(cat $TM_PIDFILE) @@ -408,7 +408,7 @@ case "$1" in rc_status -v elif [ "$DISTRIB_ID" = "Darwin" ]; then /bin/echo -n "${TS_PACKAGE_NAME} is " - launchctl list $TC_NAME > /dev/null 2>&1 + launchctl bsexec / list $TC_NAME > /dev/null 2>&1 status=$? [ $status -eq 0 ] || /bin/echo -n "not " echo "running."
