From 1817e556e2dbc2c46b273862a0eb13522bc306d1 Mon Sep 17 00:00:00 2001
From: linggao <linggao@8638fb3e-16cb-4fca-ae20-7b5d299a9bcd>
Date: Wed, 15 Oct 2008 18:14:10 +0000
Subject: [PATCH] fix for rmc monitoring

git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@2350 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd
---
 xCAT-rmc/plugin/rmcmon.pm | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/xCAT-rmc/plugin/rmcmon.pm b/xCAT-rmc/plugin/rmcmon.pm
index 4ee993d77..ca15feacf 100644
--- a/xCAT-rmc/plugin/rmcmon.pm
+++ b/xCAT-rmc/plugin/rmcmon.pm
@@ -133,7 +133,7 @@ sub start {
 	  } else { #inactive
 	    if (!exists($assocHash{"$cond:_:$resp"})) { 
               $result=`/usr/bin/mkcondresp $cond $resp  2>&1`; 
-              if ($?) {
+              if (($?) && ($result !~ /2618-201/)) { #resource already defined
                 my $rsp={};
                 $rsp->{data}->[0]="$localhostname: $result";
                 $callback->($rsp);
@@ -287,15 +287,15 @@ sub stop {
     } # if ($pid)
   
     #restop the rmc daemon
-    $result=`stopsrc -s ctrmc`;
-    if ($?) {
-      if ($callback) {
-        my $rsp={};
-        $rsp->{data}->[0]="$localhostname: RMC deamon cannot be stopped.";
-        $callback->($rsp);
-      }
-      return (1, "RMC deamon cannot be stopped\n");
-    }
+    #$result=`stopsrc -s ctrmc`;
+    #if ($?) {
+    #  if ($callback) {
+    #    my $rsp={};
+    #    $rsp->{data}->[0]="$localhostname: RMC deamon cannot be stopped.";
+    #    $callback->($rsp);
+    #  }
+    #  return (1, "RMC deamon cannot be stopped\n");
+    #}
   }
 
   if ($scope) {
@@ -1020,7 +1020,7 @@ sub addNodes {
         }
         $result=`XCATBYPASS=Y  $::XCATROOT/bin/xdcp $node $::XCATROOT/sbin/rmcmon/configrmcnode /tmp 2>&1`;
         if ($?) {
-	  my $error="cannot copy the file configrmcnode to node $node";
+          my $error="cannot copy the file configrmcnode to node $node";
           reportError("cannot copy the file configrmcnode to node $node.\n$result", $callback);
           next;
         }