diff options
| author |   Tomas Chvatal <scarabeus@gentoo.org> | 2009-11-22 13:38:27 +0000 |
|---|---|---|
| committer | Tomas Chvatal <scarabeus@gentoo.org> | 2009-11-22 13:38:27 +0000 |
| commit | b6cfe86207cff1471426566389aa6dd0d957ed41 (patch) | |
| tree | ac99ba0de7705e1bf4248fb3db1c871c375c10f3 /sci-misc | |
| parent | Stable on alpha, bug #289857 (diff) | |
| download | historical-b6cfe86207cff1471426566389aa6dd0d957ed41.tar.gz historical-b6cfe86207cff1471426566389aa6dd0d957ed41.tar.bz2 historical-b6cfe86207cff1471426566389aa6dd0d957ed41.zip | |
Update script attach function to work correcty.
Package-Manager: portage-2.2_rc51/cvs/Linux x86_64
Diffstat (limited to 'sci-misc')
| -rw-r--r-- | sci-misc/boinc/ChangeLog | 5 | ||||
| -rw-r--r-- | sci-misc/boinc/Manifest | 4 | ||||
| -rw-r--r-- | sci-misc/boinc/files/boinc.init | 35 |
3 files changed, 26 insertions, 18 deletions
diff --git a/sci-misc/boinc/ChangeLog b/sci-misc/boinc/ChangeLog index 759ac1f66dd3..55aa4c38f60b 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.81 2009/11/14 01:40:46 scarabeus Exp $ +# $Header: /var/cvsroot/gentoo-x86/sci-misc/boinc/ChangeLog,v 1.82 2009/11/22 13:38:26 scarabeus Exp $ + + 22 Nov 2009; Tomáš Chvátal <scarabeus@gentoo.org> files/boinc.init: + Update script attach function to work correcty. 14 Nov 2009; Tomáš Chvátal <scarabeus@gentoo.org> boinc-6.10.18.ebuild: Drop the server support from now on. Better for my sanity sorry guys. diff --git a/sci-misc/boinc/Manifest b/sci-misc/boinc/Manifest index 56271d872511..310843972363 100644 --- a/sci-misc/boinc/Manifest +++ b/sci-misc/boinc/Manifest @@ -6,10 +6,10 @@ AUX 6.6.40-gui01.patch 466 RMD160 dfd2811e72ec98590e68c9ff368b3d8af2160d4c SHA1 AUX 6.6.40-locale.patch 616 RMD160 1986ca21be9ae6ddb7a88aaa69ada8dd6ff9a10e SHA1 90e3f7382a4b00658976cc8b6e2eb4a43706f478 SHA256 a6b6be0c60c29c2ac40bb26b99adc4de458819c197bfd376b28c487bdfcb8843 AUX 6.6.40-xfersigseg.patch 496 RMD160 36a620c7bb620def6afd4a6ebe9185c93af43e95 SHA1 e16e6f7d52a1913ede838d298d71f4bb482b692c SHA256 e46648e81d97cac093b485a601e9c253c7dec9a6aa9fbf5cf4e540026c051dd3 AUX boinc.conf 711 RMD160 b6bb25b9d10cbefd3de5d653e701e056e2de4587 SHA1 570929cb4ed50d4fc4408624c4d0d330e208609c SHA256 032f07145ee230f069ffdc93befe90c047fba4314aedfc8024bdb44c06798e9e -AUX boinc.init 3220 RMD160 35ac85c454f089a5af8a233d656a276ac21e8b5e SHA1 7da1395ffad5654f71837a8be47372b926100dde SHA256 b670f51a8101fd741535f2809667e6adf6dbedba71caa6db061bcf79a168e1ec +AUX boinc.init 3225 RMD160 fbb2ffc29f38ce26a422bff0791bfb74b3a257df SHA1 c97b93ac32a212a5c2c1951e06237efc08540930 SHA256 726d6d96e0c81b235f3a8a4c6f27bbe115bedd9df5eb36c89c2d8169c9173296 DIST boinc-6.10.18.tar.bz2 11392526 RMD160 5fe8fac83181833f8085bac455c6252adb7b4d62 SHA1 07d695ba80faa7761d74a0b6d5cfabd5bb045a00 SHA256 a2d02b9a996ce398d1f32dbc40f8dcb5a7866a54c4936f64350391f624e31ea3 DIST boinc-6.6.40.tar.bz2 9440539 RMD160 6595c0ee0dcf8d204862541039d5f74a0347dbcc SHA1 50c5f88e538ea14193df71d1954d5cabd7b5345d SHA256 16130f3a95e703dd1604039a2e5ce8c8e3ffbfe124beb8a49806b318fee46b7d EBUILD boinc-6.10.18.ebuild 3579 RMD160 62518edc4db70422923acfafecf1fa2d9faa66e8 SHA1 c34e12f7f7fef3f598ca60f3f18a3217c3dc87de SHA256 a75fdddb9bb958328ab19d4ba665424dcb63715c032ee15880573add34bb31a6 EBUILD boinc-6.6.40-r2.ebuild 3978 RMD160 7f8c5e05b5546723f177c181616e7dd083a8c6f4 SHA1 fe14419321fe776d4a36a4722bf4cefc8a7f89e0 SHA256 b9681bd38aff4eaba3895ad0303a9c9fdb29fac6c1368add5d63afcc432baeb1 -MISC ChangeLog 15234 RMD160 3b287c474d8f9a71e20c94e1e2768f12d0c80291 SHA1 626198d9b71202db435f23acb2f06906dcd83e0a SHA256 3f64fe0d120a8787bea1c650a92e448c928a13da1631fc3a878e37f879336078 +MISC ChangeLog 15358 RMD160 f6445b0df7fa1df2edc61b9772ace8733b8ca980 SHA1 cec2a1f50ee3b92283af333911463a3b63609865 SHA256 9d13a33ec84ae1066bc7ad49d6ab9dd17404b7df035414a5bed5b3bfb36291e5 MISC metadata.xml 897 RMD160 8fbc078bbd2c887fa5f40908f23cebc97bf2427a SHA1 0dec3c60f214c346ca2c6073384d4c6411a2f6af SHA256 202c9489d999c43b25631e8259fea9711b668322b81bb3c359e018e8c445b086 diff --git a/sci-misc/boinc/files/boinc.init b/sci-misc/boinc/files/boinc.init index dcc9b8b2f15d..b8a920b5018c 100644 --- a/sci-misc/boinc/files/boinc.init +++ b/sci-misc/boinc/files/boinc.init @@ -56,22 +56,21 @@ start() { ewarn "network is needed only for jobs fetching afterwards" fi - generate_logs - if [ "${ALLOW_REMOTE_RPC}" = "yes" ]; then ARGS="${ARGS} -allow_remote_gui_rpc" fi - # sys-apps/util-linux - CHRT="/usr/bin/chrt ${SCHED_PARAM}" - - # check for baselayout version if [ -n "${RC_UNAME}" ]; then PARAMS="--background --stdout '${LOGFILE}' --stderr '${LOGFILE}' -- ${ARGS}" else PARAMS="-- ${ARGS} >> '${LOGFILE}' 2>&1 &" fi + generate_logs + + # sys-apps/util-linux + CHRT="/usr/bin/chrt ${SCHED_PARAM}" + eval ${CHRT} start-stop-daemon \ --quiet --start --chdir "${RUNTIMEDIR}" \ --pidfile "${PIDFILE}" \ @@ -95,26 +94,32 @@ start() { } attach() { + local password args url key + local was_started=true + printf " Enter the Project URL: " read url printf " Enter your Account Key: " read key - RC_QUIET_STDOUT="yes" status - if [ $? = 1 ]; then - start + password=$(cat "${RUNTIMEDIR}/gui_rpc_auth.cfg") + args="--project_attach ${url} ${key}" + + if ! service_started; then + was_started=false + "${RC_SERVICE}" start fi + ebegin "Attaching to project" - # we have to work in runtime directory - cd "${RUNTIMEDIR}" - # boinc does not return 1 when it fails currently - "${BOINCBIN}" --attach_project "${url}" "${key}" &> /dev/null - # change the perms for the files to defined user/group - chown -R ${USER}:${GROUP} * + boinccmd --host localhost --passwd ${password} ${args} eend $? + unset password args url key + sleep 10 tail "${LOGFILE}" + + [[ ${was_started} = "false" ]] && "${RC_SERVICE}" stop } stop() { |