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

fix bug 3531: New CMM firmware is adding node # \( textid \) wrapper around textd - breaks rscan -u

Browse Source 
git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/branches/2.7@16089 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd
This commit is contained in:
zhaoertao
2013-04-27 02:02:00 +00:00
parent 380928afe2
commit 468d01294a
1 changed files with 18 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
xCAT-server/lib/xcat/plugins/blade.pm
View File

@ -1489,7 +1489,13 @@ sub rscan {
if ($name =~ /Comm Error/) {
next;
}
if ($data[1] =~ /\(\s*([^\s]*)\s*\)/) {
$name = $1;
} elsif ($data[1] =~ /^\s*([^s]*)\s*$/) {
$name = $1;
$name =~ s/ /_/;
$name =~ tr/A-Z/a-z/;
}
if (exists($opt{u})) {
## TRACE_LINE print "Rscan: orig_name [$name]\n";
@ -1723,7 +1729,17 @@ sub rscan_stanza {
if ($data[1] =~ /Comm Error/) {
next;
}
$result .= "$data[1]:\n\tobjtype=node\n";
my $objname;
if ($data[1] =~ /\(\s*([^\s]*)\s*\)/) {
$objname = $1;
} elsif ($data[1] =~ /^\s*([^s]*)\s*$/) {
$objname = $1;
$objname =~ s/ /_/;
$objname =~ tr/A-Z/a-z/;
} else {
$objname = $data[1];
}
$result .= "$objname:\n\tobjtype=node\n";
foreach ( @rscan_attribs ) {
my $d = $data[$i++];