deepblue/ipmitool
1
0
Fork 0
mirror of https://github.com/ipmitool/ipmitool.git synced 2025-05-11 19:17:22 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

don't print builtin fru header twice

Browse Source
This commit is contained in:
Duncan Laurie 2005-09-09 23:27:11 +00:00
parent 8a0559a651
commit f449928806
1 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
ipmitool/lib/ipmi_fru.c
View File

@ -1232,6 +1232,10 @@ ipmi_fru_print(struct ipmi_intf * intf, struct sdr_record_fru_locator * fru)
fru->dev_type < 0x08 || fru->dev_type > 0x0f)) fru->dev_type < 0x08 || fru->dev_type > 0x0f))
return -1; return -1;
if (fru->dev_slave_addr == IPMI_BMC_SLAVE_ADDR &&
fru->device_id == 0)
return 0;
memset(desc, 0, sizeof(desc)); memset(desc, 0, sizeof(desc));
memcpy(desc, fru->id_string, fru->id_code & 0x01f); memcpy(desc, fru->id_string, fru->id_code & 0x01f);
desc[fru->id_code & 0x01f] = 0; desc[fru->id_code & 0x01f] = 0;
@ -1244,13 +1248,8 @@ ipmi_fru_print(struct ipmi_intf * intf, struct sdr_record_fru_locator * fru)
save_addr = intf->target_addr; save_addr = intf->target_addr;
/* set new target address for bridged commands */ /* set new target address for bridged commands */
intf->target_addr = fru->dev_slave_addr; intf->target_addr = fru->dev_slave_addr;
/* print FRU */
if (intf->target_addr == IPMI_BMC_SLAVE_ADDR && rc = __ipmi_fru_print(intf, fru->device_id);
fru->device_id == 0)
printf(" (Builtin FRU device)\n");
else
rc = __ipmi_fru_print(intf, fru->device_id);
/* restore previous target */ /* restore previous target */
intf->target_addr = save_addr; intf->target_addr = save_addr;
break; break;