add debug output to sysfs operations

[elogind.git] / udevd.c

diff --git a/udevd.c b/udevd.c
index f64a4252bbbb5ea018e53a88abc7fd509d52020e..3f4605ed1196af539a1757504ae39c763b400faf 100644 (file)
--- 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;
+                       }
                }
        }
 
@@ -516,12 +522,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 +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);
@@ -621,7 +625,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);