From 3295f11ac42f1f7ba320be85ba2de3844da46ee8 Mon Sep 17 00:00:00 2001
From: yinle <yinle@8638fb3e-16cb-4fca-ae20-7b5d299a9bcd>
Date: Sun, 23 Oct 2011 09:28:59 +0000
Subject: [PATCH] Fix mistake that lsslp will match the wrong definition.

git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/branches/2.6@10856 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd
---
 xCAT-server/lib/xcat/plugins/lsslp.pm | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/xCAT-server/lib/xcat/plugins/lsslp.pm b/xCAT-server/lib/xcat/plugins/lsslp.pm
index 62e6dd4f2..d68c7fb08 100644
--- a/xCAT-server/lib/xcat/plugins/lsslp.pm
+++ b/xCAT-server/lib/xcat/plugins/lsslp.pm
@@ -4094,7 +4094,7 @@ sub match_hosts_defined_by_xcatsetup {
         my $unmatched = @{$::OLD_DATA_CACHE{$oldnode}}[7];
         if ($type eq TYPE_FRAME)
         {
-            if ($tmpmtm eq $mtm and $tmpsn eq $sn) {
+            if ($tmpmtm eq $mtm and $tmpsn eq $sn and $type eq $tmptype) {
                 $$flagref = 1;
                 print "20 got old name $oldnode\n" if($DEBUG_MATCH eq 1);
                 return $oldnode;
@@ -4102,7 +4102,7 @@ sub match_hosts_defined_by_xcatsetup {
         }
         if ($type eq TYPE_CEC)
         {
-            if ($pname eq $tmpparent and $cage_number eq $tmpid) {
+            if ($pname eq $tmpparent and $cage_number eq $tmpid  and $type eq $tmptype) {
                 $$flagref = 1;
                 print "21 got old name $oldnode\n" if($DEBUG_MATCH eq 1);
                 return $oldnode;
@@ -4110,7 +4110,7 @@ sub match_hosts_defined_by_xcatsetup {
         }
         if ($type eq TYPE_BPA or $type eq TYPE_FSP)
         {
-            if ($pname eq $tmpparent and $side eq $tmpside) {
+            if ($pname eq $tmpparent and $side eq $tmpside and $type eq $tmptype) {
                 $$flagref = 1;
                 print "22 got old name $oldnode\n" if($DEBUG_MATCH eq 1);
                 return $oldnode;
@@ -4118,7 +4118,7 @@ sub match_hosts_defined_by_xcatsetup {
         }
         if ($type eq TYPE_BPA or $type eq TYPE_FSP)
         {
-            if ($pname eq $tmpparent and $side eq $tmpside) {
+            if ($pname eq $tmpparent and $side eq $tmpside and $type eq $tmptype) {
                 $$flagref = 1;
                 print "23 got old name $oldnode\n" if($DEBUG_MATCH eq 1);
                 return $oldnode;