summaryrefslogtreecommitdiff
path: root/util/ihealth.c
diff options
context:
space:
mode:
authorJörg Frings-Fürst <debian@jff-webhosting.net>2017-02-24 21:18:15 +0100
committerJörg Frings-Fürst <debian@jff-webhosting.net>2017-02-24 21:18:15 +0100
commite6806f1d217e07f52759e4fa1c792d1fe02f0d50 (patch)
tree9d88be25642b4dee4821a135522615970ac8e59f /util/ihealth.c
parentf85b8b834b7ff85c80503faa73f237040330087b (diff)
New upstream version 3.0.2upstream/3.0.2
Diffstat (limited to 'util/ihealth.c')
-rw-r--r--util/ihealth.c30
1 files changed, 16 insertions, 14 deletions
diff --git a/util/ihealth.c b/util/ihealth.c
index db228bf..2ff5ba8 100644
--- a/util/ihealth.c
+++ b/util/ihealth.c
@@ -82,7 +82,7 @@ extern int oem_supermicro_get_firmware_str(char *pstr, int sz); /*oem_supermicro
* Global variables
*/
static char * progname = "ihealth";
-static char * progver = "3.01";
+static char * progver = "3.02";
static char fdebug = 0;
static char fipmilan = 0;
static char fcanonical = 0;
@@ -634,11 +634,6 @@ void show_devid_all(int dtype, uchar *devrec, int sdevrec)
if (prod >= 0x200) prodstr = "(iRMC S2)";
else prodstr = "";
break;
- case VENDOR_LENOVO:
- case VENDOR_LENOVO2:
- if (prod == 0x143) prodstr = "(x3650 M4)";
- else prodstr = "";
- break;
case VENDOR_CISCO: /*=0x00168b, 5771.*/
if (prod == 0x0005) prodstr = "(UCS C200)";
else prodstr = "";
@@ -731,12 +726,12 @@ void show_devid_all(int dtype, uchar *devrec, int sdevrec)
switch(prod) { /* show product names for some */
case 0x2000: prodstr = "(Proliant ML/DL)"; break; /*DL380*/
case 0x2020: prodstr = "(Proliant BL)"; break;
- default: if ((prod & 0xff00) == 0x8300)
- prodstr = "(Proliant SL)";
- else prodstr = "";
- break;
+ default:
+ if ((prod & 0xff00) == 0x8300) prodstr = "(Proliant SL)";
+ else prodstr = "";
+ break;
}
- do_powerstate = 0; /*HP does not support get_power_state cmd*/
+ do_powerstate = 0; /*HP does not support get_power_state cmd*/
break;
case VENDOR_DELL: /*=0x0002A2*/
switch(prod) { /* show product names for some */
@@ -785,11 +780,18 @@ void show_devid_all(int dtype, uchar *devrec, int sdevrec)
default: prodstr = ""; break;
}
break;
+ case VENDOR_LENOVO:
+ case VENDOR_LENOVO2:
+ if (prod == 0x143) prodstr = "(x3650 M4)";
+ else prodstr = "";
+ break;
case VENDOR_IBM: /*=0x0002*/
switch(prod) { /* show product names for some */
- case 0x000e: prodstr = "(x3755)"; break;
- case 0x00dc: prodstr = "(x3650)"; break;
- case 0x8848: prodstr = "(eServer 360S)"; break;
+ case 0x000e: prodstr = "(x3755)"; break;
+ case 0x0011: prodstr = "(x3650)"; break;
+ case 0x00dc: prodstr = "(x3650 M2)"; break; /*M2,M3*/
+ case 0x00fa: prodstr = "(x3850 X5)"; break;
+ case 0x8848: prodstr = "(eServer 360S)"; break;
default: prodstr = ""; break;
}
break;