From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 5712 invoked by alias); 27 Mar 2009 19:07:36 -0000 Received: (qmail 5706 invoked by alias); 27 Mar 2009 19:07:35 -0000 X-SWARE-Spam-Status: No, hits=-1.8 required=5.0 tests=AWL,BAYES_00,SPF_HELO_PASS X-Spam-Status: No, hits=-1.8 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: STABLE3 - cman init: fix regexp for configfs To: cluster-cvs-relay@redhat.com X-Project: Cluster Project X-Git-Module: cluster.git X-Git-Refname: refs/heads/STABLE3 X-Git-Reftype: branch X-Git-Oldrev: 3d1445b62ab3d99c36fa14343da647b8ef6339d1 X-Git-Newrev: 579c7059a9348d447a2a07694f9127e2b68b3def From: "Fabio M. Di Nitto" Message-Id: <20090327190711.4AA3E12020C@lists.fedorahosted.org> Date: Fri, 27 Mar 2009 19:07: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: List-Subscribe: List-Post: List-Help: , Sender: cluster-cvs-owner@sourceware.org X-SW-Source: 2009-q1/txt/msg00954.txt.bz2 Gitweb: http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=579c7059a9348d447a2a07694f9127e2b68b3def Commit: 579c7059a9348d447a2a07694f9127e2b68b3def Parent: 3d1445b62ab3d99c36fa14343da647b8ef6339d1 Author: Fabio M. Di Nitto AuthorDate: Thu Mar 26 15:43:13 2009 +0100 Committer: Fabio M. Di Nitto CommitterDate: Fri Mar 27 20:05:47 2009 +0100 cman init: fix regexp for configfs This makes the check more safe against other debug*configfs*whatever stuff. Thanks to Jim M. for spotting it. Signed-off-by: Fabio M. Di Nitto --- cman/init.d/cman.in | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/cman/init.d/cman.in b/cman/init.d/cman.in index a4ff90c..e1efb18 100644 --- a/cman/init.d/cman.in +++ b/cman/init.d/cman.in @@ -226,9 +226,9 @@ stop_daemon() mtab_configfs() { awk '{ print $2 }' /etc/mtab | \ - grep "/sys/kernel/config" > /dev/null 2>&1 && \ + grep '^/sys/kernel/config$' > /dev/null 2>&1 && \ awk '{ print $3 }' /etc/mtab | \ - grep "configfs" > /dev/null 2>&1 + grep '^configfs$' > /dev/null 2>&1 } cman_running()