[gentoo-commits] repo/gentoo:master commit in: sci-misc/boinc/files/

[Patrice Clement]

commit:     6fbb2367cc20a9b34acde2f1df699900f310a9cf
Author:     Sven Eden <yamakuzure <AT> gmx <DOT> net>
AuthorDate: Wed Apr 13 12:09:53 2016 +0000
Commit:     Patrice Clement <monsieurp <AT> gentoo <DOT> org>
CommitDate: Tue Apr 26 07:07:58 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6fbb2367

sci-misc/boinc: Migrated boinc.init to use start-stop-daemon

The boinc init script can no longer start, attach or stop the boinc
manager if openrc-0.20 and newer is used, because openrc no longer
passes $SHELL to init scripts.

To solve the issue the init script has been migrated to use
start-stop-daemon instead of using 'su' directly.

This change should have no impact for users of previous openrc
versions.

Gentoo-Bug: https://bugs.gentoo.org/574260
Package-Manager: portage-2.2.28
Closes: https://github.com/gentoo/gentoo/pull/1244

Signed-off-by: Patrice Clement <monsieurp <AT> gentoo.org>

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

diff --git a/sci-misc/boinc/files/boinc.init b/sci-misc/boinc/files/boinc.init
index a350e3e..6ed9041 100644
--- a/sci-misc/boinc/files/boinc.init
+++ b/sci-misc/boinc/files/boinc.init
@@ -1,4 +1,7 @@
 #!/sbin/runscript
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
 
 extra_started_commands="attach"
 
@@ -59,7 +62,7 @@ start() {
 	fi
 
 	ebegin "Starting ${SVCNAME}"
-	su -m ${USER} -c "nice -n ${NICELEVEL} \"${BOINCBIN}\" ${ARGS} --daemon --dir \"${RUNTIMEDIR}\" --redirectio"
+	start-stop-daemon -S -N ${NICELEVEL} -u ${USER} -q -x "${BOINCBIN}" -- ${ARGS} --daemon --dir "${RUNTIMEDIR}" --redirectio
 	eend $?
 }
 
@@ -81,7 +84,7 @@ attach() {
 	password=$(cat "${RUNTIMEDIR}/gui_rpc_auth.cfg")
 
 	ebegin "${SVCNAME}: Attaching to project"
-	su -m ${USER} -c "boinccmd --passwd \"${password}\" --project_attach ${url} ${key}"
+	start-stop-daemon -u ${USER} -q -x boinccmd -- --passwd "${password}" --project_attach ${url} ${key}
 	eend $?
 
 	unset password url key
@@ -96,7 +99,7 @@ stop() {
 	password=$(cat "${RUNTIMEDIR}/gui_rpc_auth.cfg")
 
 	ebegin "Stopping ${SVCNAME}"
-	su -m ${USER} -c "boinccmd --passwd \"${password}\" --quit"
+	start-stop-daemon -u ${USER} -q -x boinccmd -- --passwd "${password}" --quit
 	eend $?
 
 	unset password