#include <wait.h>
#include "udev.h"
+#include "udev_version.h"
#include "udevd.h"
#include "logging.h"
static int build_hotplugmsg(struct hotplug_msg *msg, char *action,
char *devpath, char *subsystem, int seqnum)
{
- memset(msg, 0x00, sizeof(msg));
+ memset(msg, 0x00, sizeof(*msg));
msg->mtype = HOTPLUGMSGTYPE;
msg->seqnum = seqnum;
strncpy(msg->action, action, 8);
case 0:
/* daemon */
setsid();
- execl(UDEVD_EXEC, "udevd", NULL);
+ chdir("/");
+ execl(UDEVD_BIN, "udevd", NULL);
dbg("exec of daemon failed");
exit(1);
case -1:
seq = atoi(seqnum);
/* create ipc message queue or get id of our existing one */
- key = ftok(UDEVD_EXEC, IPC_KEY_ID);
+ key = ftok(UDEVD_BIN, IPC_KEY_ID);
+ dbg("using ipc queue 0x%0x", key);
size = build_hotplugmsg(&message, action, devpath, subsystem, seq);
msgid = msgget(key, IPC_CREAT);
if (msgid == -1) {
/* get state of ipc queue */
tspec.tv_sec = 0;
tspec.tv_nsec = 10000000; /* 10 millisec */
- loop = 30;
+ loop = UDEVSEND_RETRY_COUNT;
while (loop--) {
retval = msgctl(msgid, IPC_STAT, &msg_queue);
if (retval == -1) {