From 61203f6dd8e66235a741c5f73be8813faca315bb Mon Sep 17 00:00:00 2001
From: nott <nott@8638fb3e-16cb-4fca-ae20-7b5d299a9bcd>
Date: Mon, 18 Feb 2008 16:38:09 +0000
Subject: [PATCH] If xcatd processes are running then stop them.

git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@510 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd
---
 xCAT-server-2.0/sbin/xcatconfig | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/xCAT-server-2.0/sbin/xcatconfig b/xCAT-server-2.0/sbin/xcatconfig
index aa358cf0a..0b59501fd 100644
--- a/xCAT-server-2.0/sbin/xcatconfig
+++ b/xCAT-server-2.0/sbin/xcatconfig
@@ -435,10 +435,10 @@ if ( ( ! -r "$::root/.xcat/client-key.pem") || $::FORCE){
 }
 
 #
-# if this is a re-config then stop the xcatd processes
+# if there are xcatd processes then stop them
 #
-if ($::FORCE) {
-	my @xpids = xCAT::Utils->runcmd("ps -ef\|grep \"xcatd\"", 0);
+my @xpids = xCAT::Utils->runcmd("ps -ef\|grep \"xcatd\"", 0);
+if ($#xpids  >= 1) { # will have at least "0" for the grep
 	xCAT::MsgUtils->message('I', "Stopping xcatd processes....\n");
 	foreach $ps (@xpids)
 	{