From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <cluster-cvs-return-10385-listarch-cluster-cvs=sources.redhat.com@sourceware.org>
Received: (qmail 31357 invoked by alias); 6 Mar 2009 12:08:11 -0000
Received: (qmail 31350 invoked by alias); 6 Mar 2009 12:08:11 -0000
X-SWARE-Spam-Status: No, hits=-1.7 required=5.0
	tests=AWL,BAYES_00,SPF_HELO_PASS
X-Spam-Status: No, hits=-1.7 required=5.0
	tests=AWL,BAYES_00,SPF_HELO_PASS
X-Spam-Check-By: sourceware.org
X-Spam-Checker-Version: SpamAssassin 3.2.5 (2008-06-10) on
	bastion.fedora.phx.redhat.com
Subject: cluster: master - init: silence ls output on error
To: cluster-cvs-relay@redhat.com
X-Project: Cluster Project
X-Git-Module: cluster.git
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: 5fe4950b64f86a6cd81defdf50bb830f110167f1
X-Git-Newrev: ab37c04a983308130d5a4214aad92503e169c9ce
From: "Fabio M. Di Nitto" <fabbione@fedoraproject.org>
Message-Id: <20090306120748.3FB301201C1@lists.fedorahosted.org>
Date: Fri, 06 Mar 2009 12:08:00 -0000
X-Scanned-By: MIMEDefang 2.58 on 172.16.52.254
Mailing-List: contact cluster-cvs-help@sourceware.org; run by ezmlm
Precedence: bulk
List-Id: <cluster-cvs.sourceware.org>
List-Subscribe: <mailto:cluster-cvs-subscribe@sourceware.org>
List-Post: <mailto:cluster-cvs@sourceware.org>
List-Help: <mailto:cluster-cvs-help@sourceware.org>, <http://sourceware.org/lists.html#faqs>
Sender: cluster-cvs-owner@sourceware.org
X-SW-Source: 2009-q1/txt/msg00706.txt.bz2

Gitweb:        http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=ab37c04a983308130d5a4214aad92503e169c9ce
Commit:        ab37c04a983308130d5a4214aad92503e169c9ce
Parent:        5fe4950b64f86a6cd81defdf50bb830f110167f1
Author:        Fabio M. Di Nitto <fdinitto@redhat.com>
AuthorDate:    Fri Mar 6 13:01:04 2009 +0100
Committer:     Fabio M. Di Nitto <fdinitto@redhat.com>
CommitterDate: Fri Mar 6 13:07:24 2009 +0100

init: silence ls output on error

redirect stderr to null since we don't need it and it makes the
startup noisy in case there is no notification directory

Signed-off-by: Fabio M. Di Nitto <fdinitto@redhat.com>
---
 cman/init.d/cman.in |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/cman/init.d/cman.in b/cman/init.d/cman.in
index 584e02b..cf3550e 100644
--- a/cman/init.d/cman.in
+++ b/cman/init.d/cman.in
@@ -276,7 +276,7 @@ start_daemons()
 		# nothing to do
 	    ;;
 	    conditional)
-		if [ -n "$(ls -1 @NOTIFYDDIR@)" ]; then
+		if [ -n "$(ls -1 @NOTIFYDDIR@ 2>/dev/null)" ]; then
 		    errmsg=$(@SBINDIR@/cmannotifyd 2>&1 ) || return 1
 		fi
 	    ;;