X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=udevd.c;h=7dedf078f3ef91ebea9963830c0845e95e0eedae;hp=5ed8e38c98dd3073641ce0c82101e5e69280efd6;hb=274da2b23d37f2dd174f765e9cfcc485e4a5a898;hpb=fb819f5554530dd136d50aa40438e9dbeeceac01

diff --git a/udevd.c b/udevd.c
index 5ed8e38c9..7dedf078f 100644
--- a/udevd.c
+++ b/udevd.c
@@ -135,24 +135,8 @@ static int udev_event_process(struct udevd_uevent_msg *msg)
 	retval = udev_device_event(&rules, udev);
 
 	/* run programs collected by RUN-key*/
-	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:")], udev->dev->devpath, udev->action);
-			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) != 0)
-					if (!name_loop->ignore_error)
-						retval = -1;
-			}
-		}
-	}
+	if (retval == 0 && !udev->ignore_device && udev_run)
+		retval = udev_rules_run(udev);
 
 	udev_device_cleanup(udev);
 	return retval;