X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=udevd.c;h=98e3d54b3382981fdf28c479ea45f7cb4f449d4d;hb=226c074d6d27a789a1dfba869f993b53fe135958;hp=f64a4252bbbb5ea018e53a88abc7fd509d52020e;hpb=1aa1e24848903d11780db1ade355be73ad61a937;p=elogind.git

diff --git a/udevd.c b/udevd.c
index f64a4252b..98e3d54b3 100644
--- a/udevd.c
+++ b/udevd.c
@@ -117,16 +117,22 @@ static int udev_event_process(struct uevent_msg *msg)
 	retval = udev_device_event(&rules, udev);
 
 	/* run programs collected by RUN-key*/
-	if (retval == 0) {
+	if (retval == 0 && !udev->ignore_device && udev_run) {
 		struct name_entry *name_loop;
 
+		dbg("executing run list");
 		list_for_each_entry(name_loop, &udev->run_list, node) {
 			if (strncmp(name_loop->name, "socket:", strlen("socket:")) == 0)
 				pass_env_to_socket(&name_loop->name[strlen("socket:")], msg->devpath, msg->action);
-			else
-				if (run_program(name_loop->name, udev->dev->subsystem, NULL, 0, NULL,
+			else {
+				char program[PATH_SIZE];
+
+				strlcpy(program, name_loop->name, sizeof(program));
+				udev_rules_apply_format(udev, program, sizeof(program));
+				if (run_program(program, udev->dev->subsystem, NULL, 0, NULL,
 						(udev_log_priority >= LOG_INFO)))
 					retval = -1;
+			}
 		}
 	}
 
@@ -194,6 +200,10 @@ static void export_event_state(struct uevent_msg *msg, enum event_state state)
 			if (loop_msg->devpath && strcmp(loop_msg->devpath, msg->devpath) == 0)
 				return;
 
+		list_for_each_entry(loop_msg, &exec_list, node)
+			if (loop_msg->devpath && strcmp(loop_msg->devpath, msg->devpath) == 0)
+				return;
+
 		/* move failed events to the failed directory */
 		if (state == EVENT_FAILED) {
 			create_path(filename_failed);
@@ -516,12 +526,11 @@ static struct uevent_msg *get_msg_from_envbuf(const char *buf, int buf_size)
 	msg->envp[i++] = "UDEVD_EVENT=1";
 	msg->envp[i] = NULL;
 
-	if (!msg->devpath) {
-		info("DEVPATH missing, ignore message");
+	if (msg->devpath == NULL || msg->action == NULL) {
+		info("DEVPATH or ACTION missing, ignore message");
 		free(msg);
 		return NULL;
 	}
-
 	return msg;
 }
 
@@ -575,7 +584,6 @@ static struct uevent_msg *get_udevd_msg(void)
 
 	switch (usend_msg.type) {
 	case UDEVD_UEVENT_UDEVSEND:
-	case UDEVD_UEVENT_INITSEND:
 		info("udevd event message received");
 		envbuf_size = size - offsetof(struct udevd_msg, envbuf);
 		dbg("envbuf_size=%i", envbuf_size);
@@ -621,7 +629,7 @@ static struct uevent_msg *get_netlink_msg(void)
 	struct uevent_msg *msg;
 	int bufpos;
 	ssize_t size;
-	static char buffer[UEVENT_BUFFER_SIZE + 512];
+	static char buffer[UEVENT_BUFFER_SIZE+512];
 	char *pos;
 
 	size = recv(uevent_netlink_sock, &buffer, sizeof(buffer), 0);