arif/xcat-core
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix mistake that lsslp will match the wrong definition.

Browse Source 
git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/branches/2.6@10856 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd
This commit is contained in:
yinle
2011-10-23 09:28:59 +00:00
parent 5cb12eb3e7
commit 3295f11ac4
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
xCAT-server/lib/xcat/plugins/lsslp.pm
+4 -4
View File
@@ -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;