summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWilliam Hubbs <w.d.hubbs@gmail.com>2013-10-31 16:04:19 -0500
committerWilliam Hubbs <w.d.hubbs@gmail.com>2013-10-31 16:04:19 -0500
commit6965d85f2efb4e1d7b37e04af890b715091fe3d9 (patch)
tree1fe1846d7bccf908eabe99ecef8feced5ca58d2e
parent766d71c2d32d2c57969d161f4d96f15706b8ed3a (diff)
downloadopenrc-6965d85f2efb4e1d7b37e04af890b715091fe3d9.tar.gz
openrc-6965d85f2efb4e1d7b37e04af890b715091fe3d9.tar.bz2
openrc-6965d85f2efb4e1d7b37e04af890b715091fe3d9.tar.xz
Fix the service-level rc_verbose setting
This commit fixes the rc_verbose setting so that it is honored if it is set for an individual service. Thanks to whissi@whissi.de for the original patch; this one is slightly modified to be more posix. X-Gentoo-Bug: 489358 X-Gentoo-Bug: https://bugs.gentoo.org/show_bug.cgi?id=489358
-rw-r--r--sh/runscript.sh.in6
1 files changed, 6 insertions, 0 deletions
diff --git a/sh/runscript.sh.in b/sh/runscript.sh.in
index f8fcbc5..ceb9ab4 100644
--- a/sh/runscript.sh.in
+++ b/sh/runscript.sh.in
@@ -208,6 +208,12 @@ sourcex -e "@SYSCONFDIR@/rc.conf"
# Apply any ulimit defined
[ -n "${rc_ulimit:-$RC_ULIMIT}" ] && ulimit ${rc_ulimit:-$RC_ULIMIT}
+# Set verbose mode
+if yesno "${rc_verbose:-$RC_VERBOSE}"; then
+ EINFO_VERBOSE=yes
+ export EINFO_VERBOSE
+fi
+
# Apply cgroups settings if defined
if [ "$(command -v cgroup_add_service)" = "cgroup_add_service" ]; then
cgroup_add_service /sys/fs/cgroup/openrc