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 E2611138A1A for ; Wed, 18 Feb 2015 16:06:44 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 9C1F1E096D; Wed, 18 Feb 2015 16:06:43 +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 41E76E096D for ; Wed, 18 Feb 2015 16:06:43 +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 F3A0234074B for ; Wed, 18 Feb 2015 16:06:41 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id A5BD91208B for ; Wed, 18 Feb 2015 16:06:40 +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: <1424275134.9dfb85d5d236dd126d13d039eb02a97aa0e6c8ac.williamh@OpenRC> Subject: [gentoo-commits] proj/openrc:master commit in: init.d/ X-VCS-Repository: proj/openrc X-VCS-Files: init.d/local.in X-VCS-Directories: init.d/ X-VCS-Committer: williamh X-VCS-Committer-Name: William Hubbs X-VCS-Revision: 9dfb85d5d236dd126d13d039eb02a97aa0e6c8ac X-VCS-Branch: master Date: Wed, 18 Feb 2015 16:06:40 +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: 95457264-1438-4bd9-acf0-9783c947bbec X-Archives-Hash: c1974250e2355dcade74d53e7bbf1020 commit: 9dfb85d5d236dd126d13d039eb02a97aa0e6c8ac Author: William Hubbs gmail com> AuthorDate: Sun Jan 25 22:23:47 2015 +0000 Commit: William Hubbs gentoo org> CommitDate: Wed Feb 18 15:58:54 2015 +0000 URL: http://sources.gentoo.org/gitweb/?p=proj/openrc.git;a=commit;h=9dfb85d5 local: fix redirections The local service now redirects stdout and stderr for the scripts it runs to /dev/null unless it is run in verbose mode. X-Gentoo-Bug: 537444 X-Gentoo-Bug-URL: https://bugs.gentoo.org/show_bug.cgi?id=537444 --- init.d/local.in | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/init.d/local.in b/init.d/local.in index 180735d..63f8598 100644 --- a/init.d/local.in +++ b/init.d/local.in @@ -14,12 +14,13 @@ start() { ebegin "Starting local" - local file has_errors=0 retval + local file has_errors=0 redirect retval + yesno $rc_verbose || redirect='> /dev/null 2>&1' eindent for file in @SYSCONFDIR@/local.d/*.start; do if [ -x "${file}" ]; then vebegin "Executing \"${file}\"" - "${file}" 2>&1 >/dev/null + "${file}" $redirect retval=$? if [ ${retval} -ne 0 ]; then has_errors=1 @@ -52,12 +53,13 @@ stop() { ebegin "Stopping local" - local file has_errors=0 retval + local file has_errors=0 redirect retval + yesno $rc_verbose || redirect='> /dev/null 2>&1' eindent for file in @SYSCONFDIR@/local.d/*.stop; do if [ -x "${file}" ]; then vebegin "Executing \"${file}\"" - "${file}" 2>&1 >/dev/null + "${file}" $redirect retval=$? if [ ${retval} -ne 0 ]; then has_errors=1