From 58636f00450a0db7e15376118682dde1a1f15268 Mon Sep 17 00:00:00 2001
From: Tomas Chvatal <scarabeus@gentoo.org>
Date: Fri, 9 Jul 2010 16:49:01 +0000
Subject: Version bump. Drop older. Fix bugs #323635 #309439 #314155. (Portage
 version: 2.2_rc67/cvs/Linux x86_64)

---
 sci-misc/boinc/files/boinc.init | 23 ++++++++++++++---------
 1 file changed, 14 insertions(+), 9 deletions(-)

(limited to 'sci-misc/boinc/files')

diff --git a/sci-misc/boinc/files/boinc.init b/sci-misc/boinc/files/boinc.init
index b8a920b5018c..1dc028eadd1a 100644
--- a/sci-misc/boinc/files/boinc.init
+++ b/sci-misc/boinc/files/boinc.init
@@ -57,27 +57,32 @@ start() {
 	fi
 
 	if [ "${ALLOW_REMOTE_RPC}" = "yes" ]; then
-		ARGS="${ARGS} -allow_remote_gui_rpc"
+		ARGS="${ARGS} --allow_remote_gui_rpc"
 	fi
 
 	if [ -n "${RC_UNAME}" ]; then
-		PARAMS="--background --stdout '${LOGFILE}' --stderr '${LOGFILE}' -- ${ARGS}"
+		PARAMS="--background --stdout '${LOGFILE}' --stderr '${LOGFILE}' ${ARGS}"
 	else
-		PARAMS="-- ${ARGS} >> '${LOGFILE}' 2>&1 &"
+		PARAMS="${ARGS} >> '${LOGFILE}' 2>&1"
 	fi
 
 	generate_logs
 
-	# sys-apps/util-linux
-	CHRT="/usr/bin/chrt ${SCHED_PARAM}"
+	# sys-apps/util-linux (setup scheduling policy if specified, otherwise blank out
+    if [ "${SCHED_PARAM}" = "" ]; then
+        CHRT=""
+    else
+    	CHRT="/usr/bin/chrt ${SCHED_PARAM}"
+    fi
 
 	eval ${CHRT} start-stop-daemon \
-		--quiet --start --chdir "${RUNTIMEDIR}" \
-		--pidfile "${PIDFILE}" \
+		--start --quiet --chdir "${RUNTIMEDIR}" \
+        --background \
 		--make-pidfile \
-		--exec "${BOINCBIN}" --chuid "${USER}:${GROUP}" \
+		--pidfile "${PIDFILE}" \
+        --chuid "${USER}:${GROUP}" \
 		--nicelevel "${NICELEVEL}" \
-		${PARAMS}
+		--exec "${BOINCBIN}" -- ${PARAMS}
 
 	RESULT=$?
 
-- 
cgit v1.2.3-65-gdbad