Merge /u/whissi/ipmitool/ branch fix-pidfile-handling into master

http://sourceforge.net/p/ipmitool/source/merge-requests/8/
This commit is contained in:
Zdenek Styblik 2015-07-25 11:38:09 +00:00
commit 169d9ac3fc

View File

@ -704,7 +704,6 @@ ipmievd_main(struct ipmi_event_intf * eintf, int argc, char ** argv)
memset(pidfile, 0, 64); memset(pidfile, 0, 64);
sprintf(pidfile, "%s%d", DEFAULT_PIDFILE, eintf->intf->devnum); sprintf(pidfile, "%s%d", DEFAULT_PIDFILE, eintf->intf->devnum);
lprintf(LOG_NOTICE, "ipmievd: using pidfile %s", pidfile);
for (i = 0; i < argc; i++) { for (i = 0; i < argc; i++) {
if (strncasecmp(argv[i], "help", 4) == 0) { if (strncasecmp(argv[i], "help", 4) == 0) {
@ -739,6 +738,8 @@ ipmievd_main(struct ipmi_event_intf * eintf, int argc, char ** argv)
} }
} }
lprintf(LOG_DEBUG, "ipmievd: using pidfile %s", pidfile);
/* /*
* We need to open interface before forking daemon * We need to open interface before forking daemon
* so error messages are not lost to syslog and * so error messages are not lost to syslog and