From 74e2376bf9365ad9cda1f07fc69d0e913af0aab9 Mon Sep 17 00:00:00 2001 From: Jordan Hargrave Date: Thu, 4 Nov 2010 21:04:21 +0000 Subject: [PATCH] Add build support for Dell OEM commands --- ipmitool/doc/ipmitool.1 | 209 ++++++++++++++++++++++++++ ipmitool/include/ipmitool/Makefile.am | 4 +- ipmitool/lib/Makefile.am | 2 +- ipmitool/src/ipmitool.c | 2 + 4 files changed, 214 insertions(+), 3 deletions(-) diff --git a/ipmitool/doc/ipmitool.1 b/ipmitool/doc/ipmitool.1 index 3a1acfd..7bce9f5 100644 --- a/ipmitool/doc/ipmitool.1 +++ b/ipmitool/doc/ipmitool.1 @@ -225,6 +225,7 @@ Commands: shell Launch interactive IPMI shell exec Run list of commands from file set Set runtime variable for shell and exec + delloem Manage Dell OEM Extensions echo Used to echo lines to stdout in scripts ekanalyzer run FRU-Ekeying analyzer using FRU files ime Upgrade/Query Intel ME firmware @@ -858,6 +859,214 @@ Perform manual rollback of the ME firmware .RE .RE + +.TP +\fIdelloem\fP +.RS +.br + +The delloem commands provide information on Dell-specific features. +.TP +\fIlcd\fP +.RS +.br +\fBset {mode}\fR| +.br +\fB{lcdqualifier}\fR|\fB{errordisplay}\fR +.RS +.br + +Allows you to set the LCD mode and user-defined string. +.RE +.TP +\fIlcd set mode\fP +.RS +.br +\fB{none}\fR|\fB{modelname}\fR| +.br +\fB{ipv4address}\fR|\fB{macaddress}\fR| +.br +\fB{systemname}\fR|\fB{servicetag}\fR| +.br +\fB{ipv6address}\fR|\fB{ambienttemp}\fR| +.br +\fB{systemwatt}\fR|\fB{assettag}\fR| +.br +\fB{userdefined}\fR +.RS +.br + +Allows you to set the LCD display mode to any of the preceding parameters. +.RE +.RE +.TP +\fIlcd set lcdqualifier\fP +.RS +.br +\fB{watt}\fR|\fB{btuphr}\fR| +.br +\fB{celsius}\fR|\fB{fahrenheit}\fR +.RS +.br + +Allows you to set the unit for the system ambient temperature mode. +.RE +.RE +.TP +\fIlcd set errordisplay\fP +.RS +.br +\fB{sel}\fR|\fB{simple}\fR +.RS +.br + +Allows you to set the error display. +.RE +.RE +.RE +.TP +\fIlcd info\fP +.RS +.br + +Displays the LCD screen information. +.RE +.TP +\fIlcd set vkvm\fP +.RS +\fB{active}\fR|\fB{inactive}\fR +.RS +.br + +Allows you to set the vKVM status to active or inactive. When it is active and session is in progress, a message appears on LCD. +.RE +.RE +.TP +\fIlcd status\fP +.RS +.br + +Displays the LCD status for vKVM display active or inactive and Front Panel access mode (viewandmodify, view-only or disabled). +.RE +.TP +\fImac\fP +.RS +.br + +Displays the information about the system NICs. +.TP +\fImac list\fP +.RS +.br + +Displays the NIC MAC address and status of all NICs. It also displays the DRAC/iDRAC MAC address. +.RE +.TP +\fImac get\fP +.RS +\fB\fR +.RS +.br + +Displays the selected NICs MAC address and status. +.RE +.RE +.RE +.TP +\fIlan set\fP +.RS +\fB\fR +.br + +Sets the NIC selection mode (dedicated, shared, shared with failover LOM2, shared with failover all LOMs). +.RE +.TP +\fIlan get\fP +.br + +Returns the current NIC selection mode (dedicated, shared, shared with failover LOM2, shared with failover all LOMs). +.TP +\fIlan get active\fP +.br + +Returns the current active NIC (dedicated, LOM1, LOM2, LOM3 or LOM4). +.TP +\fIpowermonitor\fP +.RS +.br + +Displays power tracking statistics. +.RE +.TP +\fIpowermonitor clear cumulativepower\fP +.RS +.br + +Reset cumulative power reading. +.RE +.TP +\fIpowermonitor clear peakpower\fP +.RS +.br + +Reset peak power reading. +.RE +.TP +\fIpowermonitor powerconsumption\fP +.RS +\fB\fR|\fB\fR +.RS +.br + +Displays the power consumption in watt or btuphr. +.RE +.RE +.TP +\fIpowermonitor powerconsumptionhistory\fP +.RS +\fB\fR|\fB\fR +.RS +.br + +Displays the power consumption history in watt or btuphr. +.RE +.RE +.TP +\fIpowermonitor getpowerbudget\fP +.RS +\fB\fR|\fB\fR +.RS +.br + +Displays the power cap in watt or btuphr. +.RE +.RE +.TP +\fIpowermonitor setpowerbudget\fP +.RS +\fB\fR\fB\fR +.RS +.br + +Allows you to set the power cap in watt, BTU/hr or percentage. +.RE +.RE +.TP +\fIpowermonitor enablepowercap\fP +.RS +.br + +Enables set power cap. +.RE +.TP +\fIpowermonitor disablepowercap\fP +.RS +.br + +Disables set power cap. +.RE +.RE + .TP \fIevent\fP .RS diff --git a/ipmitool/include/ipmitool/Makefile.am b/ipmitool/include/ipmitool/Makefile.am index 0113672..04a9305 100644 --- a/ipmitool/include/ipmitool/Makefile.am +++ b/ipmitool/include/ipmitool/Makefile.am @@ -37,5 +37,5 @@ noinst_HEADERS = log.h bswap.h helper.h ipmi.h ipmi_cc.h ipmi_intf.h \ ipmi_strings.h ipmi_constants.h ipmi_user.h ipmi_pef.h \ ipmi_oem.h ipmi_isol.h ipmi_sunoem.h ipmi_picmg.h \ ipmi_fwum.h ipmi_main.h ipmi_tsol.h ipmi_firewall.h \ - ipmi_kontronoem.h ipmi_ekanalyzer.h ipmi_gendev.h ipmi_ime.h - + ipmi_kontronoem.h ipmi_ekanalyzer.h ipmi_gendev.h ipmi_ime.h \ + ipmi_delloem.h diff --git a/ipmitool/lib/Makefile.am b/ipmitool/lib/Makefile.am index 8c17ddc..9edac6a 100644 --- a/ipmitool/lib/Makefile.am +++ b/ipmitool/lib/Makefile.am @@ -39,7 +39,7 @@ libipmitool_la_SOURCES = helper.c ipmi_sdr.c ipmi_sel.c ipmi_sol.c ipmi_pef.c \ ipmi_oem.c ipmi_isol.c ipmi_sunoem.c ipmi_fwum.c ipmi_picmg.c \ ipmi_main.c ipmi_tsol.c ipmi_firewall.c ipmi_kontronoem.c \ ipmi_hpmfwupg.c ipmi_sdradd.c ipmi_ekanalyzer.c ipmi_gendev.c \ - ipmi_ime.c + ipmi_ime.c ipmi_delloem.c libipmitool_la_LDFLAGS = -export-dynamic libipmitool_la_LIBADD = -lm diff --git a/ipmitool/src/ipmitool.c b/ipmitool/src/ipmitool.c index b252c84..28b9424 100644 --- a/ipmitool/src/ipmitool.c +++ b/ipmitool/src/ipmitool.c @@ -61,6 +61,7 @@ #include #include #include +#include #include #include @@ -106,6 +107,7 @@ struct ipmi_cmd ipmitool_cmd_list[] = { { ipmi_picmg_main, "picmg", "Run a PICMG/ATCA extended cmd"}, { ipmi_fwum_main, "fwum", "Update IPMC using Kontron OEM Firmware Update Manager" }, { ipmi_firewall_main,"firewall","Configure Firmware Firewall" }, + { ipmi_delloem_main, "delloem", "OEM Commands for Dell systems" }, #ifdef HAVE_READLINE { ipmi_shell_main, "shell", "Launch interactive IPMI shell" }, #endif