X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=udevd.c;h=c94fdc74d8ed4fc5c85a66e489fd26cc9116c170;hb=36af2ddcb92c51acad0f909bb5dfb090cea9c5ed;hp=ffa81bbb75034963f1033fcfd765028fc4e87a29;hpb=7d1e179f86aabeb5c206bf9b5bcac52235a9afbf;p=elogind.git

diff --git a/udevd.c b/udevd.c
index ffa81bbb7..c94fdc74d 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;
+			}
 		}
 	}