summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTomas Chvatal <scarabeus@gentoo.org>2009-02-01 14:33:37 +0000
committerTomas Chvatal <scarabeus@gentoo.org>2009-02-01 14:33:37 +0000
commitd6926353986241424a21a14380399b512da53825 (patch)
treecf6667ecd464b4c02b10ad2b60b8dbfc0038579b /sci-misc
parentMask monopod for removal. (diff)
downloadhistorical-d6926353986241424a21a14380399b512da53825.tar.gz
historical-d6926353986241424a21a14380399b512da53825.tar.bz2
historical-d6926353986241424a21a14380399b512da53825.zip
Update init script so it works with baselayout1 again. Per bug #257113.
Package-Manager: portage-2.2_rc23/cvs/Linux x86_64
Diffstat (limited to 'sci-misc')
-rw-r--r--sci-misc/boinc/ChangeLog5
-rw-r--r--sci-misc/boinc/Manifest4
-rw-r--r--sci-misc/boinc/files/boinc.init11
3 files changed, 15 insertions, 5 deletions
diff --git a/sci-misc/boinc/ChangeLog b/sci-misc/boinc/ChangeLog
index 1321e2b759cf..e8675279fcd4 100644
--- a/sci-misc/boinc/ChangeLog
+++ b/sci-misc/boinc/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for sci-misc/boinc
# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-misc/boinc/ChangeLog,v 1.47 2009/01/31 15:19:36 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-misc/boinc/ChangeLog,v 1.48 2009/02/01 14:33:37 scarabeus Exp $
+
+ 01 Feb 2009; Tomas Chvatal <scarabeus@gentoo.org> files/boinc.init:
+ Update init script so it works with baselayout1 again. Per bug #257113.
*boinc-6.4.5 (31 Jan 2009)
diff --git a/sci-misc/boinc/Manifest b/sci-misc/boinc/Manifest
index 79b836ca49a7..a2a27504c61d 100644
--- a/sci-misc/boinc/Manifest
+++ b/sci-misc/boinc/Manifest
@@ -1,6 +1,6 @@
AUX boinc.conf 711 RMD160 b6bb25b9d10cbefd3de5d653e701e056e2de4587 SHA1 570929cb4ed50d4fc4408624c4d0d330e208609c SHA256 032f07145ee230f069ffdc93befe90c047fba4314aedfc8024bdb44c06798e9e
-AUX boinc.init 2814 RMD160 54d549964de9aca444851b60f69b76acd1e3d329 SHA1 8876f70b534c508436823c6fff542dcf1ede22a4 SHA256 4e75b417ed875c82d6800781152b9f15faad45c64d1394a48433a8aaec5818c0
+AUX boinc.init 2999 RMD160 3fdc392ccde92f84a8d438b003b131e2b0fd5210 SHA1 2ec402f8a8a0f1c7e6f0784cfe4ed7b64b096e4c SHA256 c006b401e79f4958083cb22d958a02e1b8cdd944e3ec6f271b104e63f9a63ee9
DIST boinc-6.4.5.tar.bz2 7641082 RMD160 5d2cb9e645aec52c91fcf791eac8146a202594ca SHA1 6038e13c828b411b18a0f255454c3210d3581deb SHA256 f2ec1a11cc455b3f445470d5261ab37d76ffde53e98ecf3dbc6463793de58363
EBUILD boinc-6.4.5.ebuild 3696 RMD160 2423d534cd5e89dad0119c2cc80de62d1613d931 SHA1 3448405d6eb792f570fdba5402eb219700f88492 SHA256 251d487547524897baa38aa5856688bd110513a7e7e4bcdb3c29c77873b14cfe
-MISC ChangeLog 9703 RMD160 46917959db94e11c966543d4bbc8bcd33d7d24f9 SHA1 df3596d5940fed163b4be9bba2c680f6e642ab71 SHA256 2793c2ccf32ad5c3b745840c377f0f7dc5eea176e57d964b1e84a14b976b3b88
+MISC ChangeLog 9848 RMD160 be050575a8255bef15b58e0702d8265da42564f8 SHA1 5573e8c7ce535dbeb29285f6bbc5fb5eb834b845 SHA256 c974c079198bec5a6d62260ef00fbb5ae5a7ac4172f207cc0cd749f2d4d11354
MISC metadata.xml 697 RMD160 8cfc36bbae9395d2675629d68af1c6354244bd5f SHA1 bcfd28d367a81a6fa8b6a548703270cb066a9392 SHA256 614f44eeb4b76fccb040b9ab7dee69e50152c930a9224946010f39e7eed6e04c
diff --git a/sci-misc/boinc/files/boinc.init b/sci-misc/boinc/files/boinc.init
index 55ebfd4398ff..5013516bb8ed 100644
--- a/sci-misc/boinc/files/boinc.init
+++ b/sci-misc/boinc/files/boinc.init
@@ -64,11 +64,18 @@ start() {
# sys-apps/util-linux
CHRT="/usr/bin/chrt ${SCHED_PARAM}"
+ # check for baselayout version
+ if [[ "`start-stop-daemon --version |awk -F' ' '{print $2}'`" = "(OpenRC)" ]]; then
+ PARAMS="--stdout ${LOGFILE} --stderr ${LOGFILE} -- ${ARGS}"
+ else
+ PARAMS="-- ${ARGS} &> ${LOGFILE}"
+ fi
+
${CHRT} start-stop-daemon \
--quiet --start --chdir ${RUNTIMEDIR} \
--exec ${BOINCBIN} --chuid ${USER}:${GROUP} \
- --background --stdout ${LOGFILE} --stderr ${LOGFILE} \
- --nicelevel ${NICELEVEL} -- ${ARGS}
+ --background --nicelevel ${NICELEVEL} \
+ ${PARAMS}
RESULT=$?