From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id CA4201386F0 for ; Thu, 31 Oct 2013 21:09:36 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 9BAF6E0856; Thu, 31 Oct 2013 21:09:31 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 3446DE0856 for ; Thu, 31 Oct 2013 21:09:29 +0000 (UTC) Received: from hornbill.gentoo.org (hornbill.gentoo.org [94.100.119.163]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 87D1733F0D9 for ; Thu, 31 Oct 2013 21:09:26 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id 24F46E549F for ; Thu, 31 Oct 2013 21:09:25 +0000 (UTC) From: "William Hubbs" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "William Hubbs" Message-ID: <1383253459.6965d85f2efb4e1d7b37e04af890b715091fe3d9.williamh@OpenRC> Subject: [gentoo-commits] proj/openrc:master commit in: sh/ X-VCS-Repository: proj/openrc X-VCS-Files: sh/runscript.sh.in X-VCS-Directories: sh/ X-VCS-Committer: williamh X-VCS-Committer-Name: William Hubbs X-VCS-Revision: 6965d85f2efb4e1d7b37e04af890b715091fe3d9 X-VCS-Branch: master Date: Thu, 31 Oct 2013 21:09:25 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: fb8aa098-81f4-46fe-ad68-dd3e094ba542 X-Archives-Hash: d6b9601fa8441fbc50e2c24373e7013d commit: 6965d85f2efb4e1d7b37e04af890b715091fe3d9 Author: William Hubbs gmail com> AuthorDate: Thu Oct 31 21:04:19 2013 +0000 Commit: William Hubbs gentoo org> CommitDate: Thu Oct 31 21:04:19 2013 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/openrc.git;a=commit;h=6965d85f 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 --- sh/runscript.sh.in | 6 ++++++ 1 file changed, 6 insertions(+) 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