remove UDEVD_UEVENT_INITSEND

[elogind.git] / udevd.c

diff --git a/udevd.c b/udevd.c
index 4ed2f94bfc50c0a0f3d51dcc3b612c2b03b663ab..3f4605ed1196af539a1757504ae39c763b400faf 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);
@@ -526,7 +527,6 @@ static struct uevent_msg *get_msg_from_envbuf(const char *buf, int buf_size)
                free(msg);
                return NULL;
        }
-
        return msg;
 }
 
@@ -580,7 +580,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);