083 release

[elogind.git] / udevd.c

diff --git a/udevd.c b/udevd.c
index 8a352e1eb9f52b07f4d9b6cd71d09e16e94eb158..c94fdc74d8ed4fc5c85a66e489fd26cc9116c170 100644 (file)
--- a/udevd.c
+++ b/udevd.c
@@ -117,9 +117,10 @@ 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);
@@ -127,7 +128,7 @@ static int udev_event_process(struct uevent_msg *msg)
                                char program[PATH_SIZE];
 
                                strlcpy(program, name_loop->name, sizeof(program));
-                               apply_format(udev, program, 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;