| 1 |
commit: 2563ac2933be85a58e7bc953e1f80ac0b04f173b |
| 2 |
Author: Sven Eden <yamakuzure <AT> gmx <DOT> net> |
| 3 |
AuthorDate: Wed May 24 07:29:35 2017 +0000 |
| 4 |
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sun Jun 4 17:02:35 2017 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2563ac29 |
| 7 |
|
| 8 |
sci-misc/boinc: Fix suspend/resume commands in the init script. |
| 9 |
|
| 10 |
Both suspend and resume do not work any more, at least with boinc-7.6.33. |
| 11 |
The reason is, that fetching the project URLs require password authentication. |
| 12 |
|
| 13 |
This commit adds the required steps to no longer get an authentication error |
| 14 |
when trying to suspend/resume boinc. |
| 15 |
|
| 16 |
Closes: https://github.com/gentoo/gentoo/pull/4732 |
| 17 |
Package-Manager: portage-2.3.6 |
| 18 |
|
| 19 |
...boinc-7.2.44-r3.ebuild => boinc-7.2.44-r4.ebuild} | 0 |
| 20 |
...boinc-7.4.52-r3.ebuild => boinc-7.4.52-r4.ebuild} | 0 |
| 21 |
...boinc-7.6.33-r3.ebuild => boinc-7.6.33-r4.ebuild} | 0 |
| 22 |
sci-misc/boinc/files/boinc.init | 20 ++++++++++++-------- |
| 23 |
4 files changed, 12 insertions(+), 8 deletions(-) |
| 24 |
|
| 25 |
diff --git a/sci-misc/boinc/boinc-7.2.44-r3.ebuild b/sci-misc/boinc/boinc-7.2.44-r4.ebuild |
| 26 |
similarity index 100% |
| 27 |
rename from sci-misc/boinc/boinc-7.2.44-r3.ebuild |
| 28 |
rename to sci-misc/boinc/boinc-7.2.44-r4.ebuild |
| 29 |
|
| 30 |
diff --git a/sci-misc/boinc/boinc-7.4.52-r3.ebuild b/sci-misc/boinc/boinc-7.4.52-r4.ebuild |
| 31 |
similarity index 100% |
| 32 |
rename from sci-misc/boinc/boinc-7.4.52-r3.ebuild |
| 33 |
rename to sci-misc/boinc/boinc-7.4.52-r4.ebuild |
| 34 |
|
| 35 |
diff --git a/sci-misc/boinc/boinc-7.6.33-r3.ebuild b/sci-misc/boinc/boinc-7.6.33-r4.ebuild |
| 36 |
similarity index 100% |
| 37 |
rename from sci-misc/boinc/boinc-7.6.33-r3.ebuild |
| 38 |
rename to sci-misc/boinc/boinc-7.6.33-r4.ebuild |
| 39 |
|
| 40 |
diff --git a/sci-misc/boinc/files/boinc.init b/sci-misc/boinc/files/boinc.init |
| 41 |
index ceeeac87145..23450a6857c 100644 |
| 42 |
--- a/sci-misc/boinc/files/boinc.init |
| 43 |
+++ b/sci-misc/boinc/files/boinc.init |
| 44 |
@@ -184,15 +184,17 @@ resume() { |
| 45 |
env_check || return 1 |
| 46 |
|
| 47 |
local password="" |
| 48 |
- local master_urls=( \ |
| 49 |
- $("${BOINCCMD}" --get_project_status | \ |
| 50 |
- sed -n 's/\s*master URL: //p') \ |
| 51 |
- ) |
| 52 |
|
| 53 |
if need_passwd_arg; then |
| 54 |
password="--passwd \"$(cat "${RUNTIMEDIR}/gui_rpc_auth.cfg")\"" |
| 55 |
fi |
| 56 |
|
| 57 |
+ local master_urls=( \ |
| 58 |
+ $(cd "${RUNTIMEDIR}" ; \ |
| 59 |
+ "${BOINCCMD}" ${password} --get_project_status | \ |
| 60 |
+ sed -n 's/\s*master URL: //p') \ |
| 61 |
+ ) |
| 62 |
+ |
| 63 |
for url in "${master_urls[@]}"; do |
| 64 |
ebegin "Resuming $url" |
| 65 |
start-stop-daemon --user "${USER}:${GROUP}" --quiet \ |
| 66 |
@@ -207,15 +209,17 @@ suspend() { |
| 67 |
env_check || return 1 |
| 68 |
|
| 69 |
local password="" |
| 70 |
- local master_urls=( \ |
| 71 |
- $("${BOINCCMD}" --get_project_status | \ |
| 72 |
- sed -n 's/\s*master URL: //p') \ |
| 73 |
- ) |
| 74 |
|
| 75 |
if need_passwd_arg; then |
| 76 |
password="--passwd \"$(cat "${RUNTIMEDIR}/gui_rpc_auth.cfg")\"" |
| 77 |
fi |
| 78 |
|
| 79 |
+ local master_urls=( \ |
| 80 |
+ $(cd "${RUNTIMEDIR}" ; \ |
| 81 |
+ "${BOINCCMD}" ${password} --get_project_status | \ |
| 82 |
+ sed -n 's/\s*master URL: //p') \ |
| 83 |
+ ) |
| 84 |
+ |
| 85 |
for url in "${master_urls[@]}"; do |
| 86 |
ebegin "Suspending $url" |
| 87 |
start-stop-daemon --user "${USER}:${GROUP}" --quiet \ |
Archives