pool/ipmitool
SHA256
6
0
Fork 1
Code Issues Pull Requests Packages Projects Releases Wiki Activity

- Add correct exit code on Dell specific commands which did not get mainline

Browse Source 
yet (bnc#886184)
* Add patch: fix_dell_oem_exitcode

OBS-URL: https://build.opensuse.org/package/show/systemsmanagement/ipmitool?expand=0&rev=30
This commit is contained in:
Thomas Renninger 2015-03-11 15:22:31 +00:00 committed by Git OBS Bridge
parent f2f6b45527
commit 4b246df1e9
3 changed files with 49 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
fix_dell_oem_exitcode Normal file
View File

@ -0,0 +1,38 @@
From: Paul Zirnik <tami@suse.de>
Return proper error value for Dell oem commands - easy and obvious fix
Signed-off-by: Thomas Renninger <trenn@suse.de>
diff --git a/lib/ipmi_delloem.c b/lib/ipmi_delloem.c
index d18e84a..2214c99 100644
--- a/lib/ipmi_delloem.c
+++ b/lib/ipmi_delloem.c
@@ -273,22 +273,22 @@ ipmi_delloem_main(struct ipmi_intf * intf, int argc, char ** argv)
return 0;
}
if (0 ==strncmp(argv[current_arg], "lcd\0", 4)) {
- ipmi_delloem_lcd_main(intf,argc,argv);
+ rc = ipmi_delloem_lcd_main(intf,argc,argv);
} else if (strncmp(argv[current_arg], "mac\0", 4) == 0) {
/* mac address*/
- ipmi_delloem_mac_main(intf,argc,argv);
+ rc = ipmi_delloem_mac_main(intf,argc,argv);
} else if (strncmp(argv[current_arg], "lan\0", 4) == 0) {
/* lan address*/
- ipmi_delloem_lan_main(intf,argc,argv);
+ rc = ipmi_delloem_lan_main(intf,argc,argv);
} else if (strncmp(argv[current_arg], "setled\0", 7) == 0) {
/* SetLED support */
- ipmi_delloem_setled_main(intf,argc,argv);
+ rc = ipmi_delloem_setled_main(intf,argc,argv);
} else if (strncmp(argv[current_arg], "powermonitor\0", 13) == 0) {
/*Powermanagement report processing*/
- ipmi_delloem_powermonitor_main(intf,argc,argv);
+ rc = ipmi_delloem_powermonitor_main(intf,argc,argv);
} else if (strncmp(argv[current_arg], "vFlash\0", 7) == 0) {
/* vFlash Support */
- ipmi_delloem_vFlash_main(intf,argc,argv);
+ rc = ipmi_delloem_vFlash_main(intf,argc,argv);
} else {
usage();
return -1;

7
ipmitool.changes
View File

@ -1,3 +1,10 @@
-------------------------------------------------------------------
Wed Mar 11 15:21:40 UTC 2015 - trenn@suse.de
- Add correct exit code on Dell specific commands which did not get mainline
yet (bnc#886184)
* Add patch: fix_dell_oem_exitcode
-------------------------------------------------------------------
Thu Jan 15 13:56:40 UTC 2015 - trenn@suse.de

3
ipmitool.spec
View File

@ -40,6 +40,8 @@ Patch9: ipmitool_adjust_suse.paths
Patch10: 0001-Incorporate-upstream-comments-to-289-add-whitespace.patch
Patch11: ipmitool-1.8.10-implicit-fortify-decl.patch
Patch12: latest_compile_fixes.patch
Patch13: fix_dell_oem_exitcode
BuildRoot: %{_tmppath}/%{name}-%{version}-build
# bmc-snmp-proxy needs /usr/sbin/snmpd
Requires: net-snmp
@ -74,6 +76,7 @@ and setting LAN configuration, and chassis power control.
%patch10 -p1
%patch11 -p0
%patch12 -p1
%patch13 -p1
%build
touch INSTALL NEWS