[gentoo-commits] gentoo-x86 commit in sci-misc/boinc/files: boinc.init

["Tomas Chvatal (scarabeus)" <scarabeus@gentoo.org>]

scarabeus    10/07/09 16:49:01

  Modified:             boinc.init
  Log:
  Version bump. Drop older. Fix bugs #323635 #309439 #314155.
  (Portage version: 2.2_rc67/cvs/Linux x86_64)

Revision  Changes    Path
1.20                 sci-misc/boinc/files/boinc.init

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-misc/boinc/files/boinc.init?rev=1.20&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-misc/boinc/files/boinc.init?rev=1.20&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-misc/boinc/files/boinc.init?r1=1.19&r2=1.20

Index: boinc.init
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sci-misc/boinc/files/boinc.init,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- boinc.init	22 Nov 2009 13:38:27 -0000	1.19
+++ boinc.init	9 Jul 2010 16:49:01 -0000	1.20
@@ -57,27 +57,32 @@
 	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=$?