xCAT/xcat-core
2
0
Fork 0
mirror of https://github.com/xcat2/xcat-core.git synced 2025-05-22 11:42:05 +00:00
Code Issues Releases Wiki Activity

Merge pull request #4470 from gurevichmark/openbmc_dump_clear_msg

Browse Source 
Do not display message for clearing dumps when only PNOR
This commit is contained in:
xuweibj 2017-12-08 08:34:37 +08:00 committed by GitHub
commit 6364f8c20a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
xCAT-server/lib/xcat/plugins/openbmc.pm
View File

@ -1017,7 +1017,7 @@ sub parse_args {
return ([ 1, "No dump file ID specified" ]) unless ($ARGV[2]);
return ([ 1, "Invalid parameter for $command $option $ARGV[2]" ]) if ($ARGV[2] !~ /^\d*$/);
} elsif ($option =~ /^-c$|^--clear$/) {
return ([ 1, "No dump file ID specified" ]) unless ($ARGV[2]);
return ([ 1, "No dump file ID specified. To clear all, specify 'all'." ]) unless ($ARGV[2]);
return ([ 1, "Invalid parameter for $command $option $ARGV[2]" ]) if ($ARGV[2] !~ /^\d*$/ and $ARGV[2] ne "all");
} elsif ($option and $option !~ /^-l$|^--list$|^-g$|^--generate$/) {
return ([ 1, "Invalid parameter for $command $option" ]);
@ -2383,9 +2383,8 @@ sub rinv_response {
if (($purpose_value =~ /BMC/) and
($priority_value == 0 and %{$functional} and !exists($functional->{$sw_id}))) {
$to_clear_dump = 1;
last;
}
@sorted_output = ();
last;
}
#
@ -2451,6 +2450,7 @@ sub rinv_response {
}
}
}
@sorted_output = () if ($status_info{RINV_FIRM_RESPONSE}{check});
# If sorted array has any contents, sort it naturally and print it
if (scalar @sorted_output > 0) {
# sort alpha, then numeric
@ -2464,7 +2464,9 @@ sub rinv_response {
}
} else {
if ($status_info{RINV_FIRM_RESPONSE}{check}) {
xCAT::MsgUtils->message("I", { data => ["$node: Firmware will be flashed on reboot, deleting all BMC diagnostics..."] }, $callback);
if ($to_clear_dump) {
xCAT::MsgUtils->message("I", { data => ["$node: Firmware will be flashed on reboot, deleting all BMC diagnostics..."] }, $callback);
}
} else {
xCAT::MsgUtils->message("I", { data => ["$node: $::NO_ATTRIBUTES_RETURNED"] }, $callback);
}