Gentoo Archives: gentoo-commits

From: William Hubbs <williamh@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/openrc:master commit in: sh/
Date: Thu, 31 Oct 2013 21:09:36
Message-Id: 1383253459.6965d85f2efb4e1d7b37e04af890b715091fe3d9.williamh@OpenRC
1 commit: 6965d85f2efb4e1d7b37e04af890b715091fe3d9
2 Author: William Hubbs <w.d.hubbs <AT> gmail <DOT> com>
3 AuthorDate: Thu Oct 31 21:04:19 2013 +0000
4 Commit: William Hubbs <williamh <AT> gentoo <DOT> org>
5 CommitDate: Thu Oct 31 21:04:19 2013 +0000
6 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/openrc.git;a=commit;h=6965d85f
7
8 Fix the service-level rc_verbose setting
9
10 This commit fixes the rc_verbose setting so that it is honored if it is
11 set for an individual service.
12
13 Thanks to whissi <AT> whissi.de for the original patch; this one is slightly
14 modified to be more posix.
15
16 X-Gentoo-Bug: 489358
17 X-Gentoo-Bug: https://bugs.gentoo.org/show_bug.cgi?id=489358
18
19 ---
20 sh/runscript.sh.in | 6 ++++++
21 1 file changed, 6 insertions(+)
22
23 diff --git a/sh/runscript.sh.in b/sh/runscript.sh.in
24 index f8fcbc5..ceb9ab4 100644
25 --- a/sh/runscript.sh.in
26 +++ b/sh/runscript.sh.in
27 @@ -208,6 +208,12 @@ sourcex -e "@SYSCONFDIR@/rc.conf"
28 # Apply any ulimit defined
29 [ -n "${rc_ulimit:-$RC_ULIMIT}" ] && ulimit ${rc_ulimit:-$RC_ULIMIT}
30
31 +# Set verbose mode
32 +if yesno "${rc_verbose:-$RC_VERBOSE}"; then
33 + EINFO_VERBOSE=yes
34 + export EINFO_VERBOSE
35 +fi
36 +
37 # Apply cgroups settings if defined
38 if [ "$(command -v cgroup_add_service)" = "cgroup_add_service" ]; then
39 cgroup_add_service /sys/fs/cgroup/openrc