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 301D9138CCE for ; Sun, 29 Mar 2015 23:37:25 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 2DF80E0A7C; Sun, 29 Mar 2015 23:37:24 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id D7766E0A7C for ; Sun, 29 Mar 2015 23:37:23 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id F2333340A0A for ; Sun, 29 Mar 2015 23:37:22 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 0430114CFA for ; Sun, 29 Mar 2015 23:37:18 +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: <1427670332.c068762c4cf49e7ea9719dcab2e5f7d4c4e7e2e5.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: c068762c4cf49e7ea9719dcab2e5f7d4c4e7e2e5 X-VCS-Branch: master Date: Sun, 29 Mar 2015 23:37:18 +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: 1c8665e9-37f8-47ae-a93b-80b5756163b4 X-Archives-Hash: 3ff843ccf54f4762529832a184f4c03c commit: c068762c4cf49e7ea9719dcab2e5f7d4c4e7e2e5 Author: William Hubbs gmail com> AuthorDate: Sun Mar 29 20:20:52 2015 +0000 Commit: William Hubbs gentoo org> CommitDate: Sun Mar 29 23:05:32 2015 +0000 URL: https://gitweb.gentoo.org/proj/openrc.git/commit/?id=c068762c Fix rc_verbose processing We were processing the rc_verbose setting before we sourced the configuration file where it was set; this fixes the issue. Fixes #46 sh/runscript.sh.in | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/sh/runscript.sh.in b/sh/runscript.sh.in index 06d51d0..4c47260 100644 --- a/sh/runscript.sh.in +++ b/sh/runscript.sh.in @@ -189,10 +189,6 @@ status() } yesno $RC_DEBUG && set -x -if yesno "${rc_verbose:-$RC_VERBOSE}"; then - EINFO_VERBOSE=yes - export EINFO_VERBOSE -fi _conf_d=${RC_SERVICE%/*}/../conf.d # If we're net.eth0 or openvpn.work then load net or openvpn config @@ -213,6 +209,12 @@ unset _conf_d # Load any system overrides sourcex -e "@SYSCONFDIR@/rc.conf" +# Set verbose mode +if yesno "${rc_verbose:-$RC_VERBOSE}"; then + EINFO_VERBOSE=yes + export EINFO_VERBOSE +fi + for _cmd; do if [ "$_cmd" != status -a "$_cmd" != describe ]; then # Apply any ulimit defined