From 6f69796223495182712cdb0c5538b559ad2be875 Mon Sep 17 00:00:00 2001
From: jbjohnso <jbjohnso@8638fb3e-16cb-4fca-ae20-7b5d299a9bcd>
Date: Mon, 6 May 2013 15:26:42 +0000
Subject: [PATCH] Fix blade to once again work correctly with bladecenter

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

diff --git a/xCAT-server/lib/xcat/plugins/blade.pm b/xCAT-server/lib/xcat/plugins/blade.pm
index e88e8976e..f163cab31 100644
--- a/xCAT-server/lib/xcat/plugins/blade.pm
+++ b/xCAT-server/lib/xcat/plugins/blade.pm
@@ -428,10 +428,10 @@ sub eventlog { #Tried various optimizations, but MM seems not to do bulk-request
       my $matchstring;
       if ($slot > 0) {
         #$matchstring=sprintf("BLADE_%02d",$slot);
-        $matchstring=sprintf("NODE_%02d",$slot);
+        $matchstring=sprintf("(NODE_%02d|BLADE_%02d)",$slot,$slot);
       } else {
         #$matchstring="^(?!BLADE).*";
-        $matchstring="^(?!NODE).*";
+        $matchstring="^(?!(NODE|BLADE)).*";
       }
       if ($source =~ m/$matchstring$/i) { #MM guys changed their minds on capitalization
         if (defined($order)) {
@@ -446,7 +446,7 @@ sub eventlog { #Tried various optimizations, but MM seems not to do bulk-request
       } else {
           foreach (@moreslots) {
             #$matchstring=sprintf("BLADE_%02d",$_);
-            $matchstring=sprintf("NODE_%02d",$_);
+            $matchstring=sprintf("(NODE_%02d|BLADE_%02d",$_,$_);
             if ($source =~ m/$matchstring$/i) { #MM guys changed their minds on capitalization
                 if (defined($order)) {
                     $numentries++;