libsysfs: accept sysmlinks to directories instead of real directories

[elogind.git] / udevd.c

diff --git a/udevd.c b/udevd.c
index 3a8ac639bd68ec7a78c4cde51b614f073fffb2fc..a926715908bbcbab7d0b6f7cd7c0a85d26a99913 100644 (file)
--- a/udevd.c
+++ b/udevd.c
@@ -131,15 +131,6 @@ static void msg_queue_insert(struct uevent_msg *msg)
                        init_phase = 0;
        }
 
-       /* don't delay messages with timeout set */
-       if (msg->timeout) {
-               info("seq %llu with timeout %u seconds will be execute without queuing, '%s' '%s'",
-                    msg->seqnum, msg->timeout, msg->action, msg->devpath);
-               list_add(&msg->node, &exec_list);
-               run_exec_q = 1;
-               return;
-       }
-
        /* sort message by sequence number into list */
        list_for_each_entry_reverse(loop_msg, &msg_list, node) {
                if (loop_msg->seqnum < msg->seqnum)
@@ -204,7 +195,7 @@ static int running_processes(void)
        if (f == -1)
                return -1;
 
-       len = read(f, buf, sizeof(buf));
+       len = read(f, buf, sizeof(buf)-1);
        close(f);
 
        if (len <= 0)
@@ -253,7 +244,7 @@ static int running_processes_in_session(pid_t session, int limit)
                if (f == -1)
                        continue;
 
-               len = read(f, line, sizeof(line));
+               len = read(f, line, sizeof(line)-1);
                close(f);
 
                if (len <= 0)
@@ -419,8 +410,9 @@ recheck:
 
                /* limit timeout during initialization phase */
                if (init_phase) {
-                       timeout = UDEVD_INIT_EVENT_TIMEOUT;
-                       dbg("initialization phase, limit timeout to %i seconds", UDEVD_INIT_EVENT_TIMEOUT);
+                       if (timeout > UDEVD_INIT_EVENT_TIMEOUT)
+                               timeout = UDEVD_INIT_EVENT_TIMEOUT;
+                       dbg("initialization phase, timeout %i seconds", timeout);
                }
 
                /* move event with expired timeout to the exec list */
@@ -619,7 +611,7 @@ static struct uevent_msg *get_netlink_msg(void)
        pos[0] = '\0';
 
        if (msg->action == NULL) {
-               err("no ACTION in payload found, skip event '%s'", buffer);
+               info("no ACTION in payload found, skip event '%s'", buffer);
                free(msg);
                return NULL;
        }
@@ -694,7 +686,7 @@ static void reap_sigchilds(void)
 static int init_udevd_socket(void)
 {
        struct sockaddr_un saddr;
-       const int buffersize = 1024 * 1024;
+       const int buffersize = 16 * 1024 * 1024;
        socklen_t addrlen;
        const int feature_on = 1;
        int retval;
@@ -712,7 +704,7 @@ static int init_udevd_socket(void)
        }
 
        /* set receive buffersize */
-       setsockopt(udevd_sock, SOL_SOCKET, SO_RCVBUF, &buffersize, sizeof(buffersize));
+       setsockopt(udevd_sock, SOL_SOCKET, SO_RCVBUFFORCE, &buffersize, sizeof(buffersize));
 
        /* the bind takes care of ensuring only one copy running */
        retval = bind(udevd_sock, (struct sockaddr *) &saddr, addrlen);
@@ -731,7 +723,7 @@ static int init_udevd_socket(void)
 static int init_uevent_netlink_sock(void)
 {
        struct sockaddr_nl snl;
-       const int buffersize = 1024 * 1024;
+       const int buffersize = 16 * 1024 * 1024;
        int retval;
 
        memset(&snl, 0x00, sizeof(struct sockaddr_nl));
@@ -746,7 +738,7 @@ static int init_uevent_netlink_sock(void)
        }
 
        /* set receive buffersize */
-       setsockopt(uevent_netlink_sock, SOL_SOCKET, SO_RCVBUF, &buffersize, sizeof(buffersize));
+       setsockopt(uevent_netlink_sock, SOL_SOCKET, SO_RCVBUFFORCE, &buffersize, sizeof(buffersize));
 
        retval = bind(uevent_netlink_sock, (struct sockaddr *) &snl,
                      sizeof(struct sockaddr_nl));
@@ -873,7 +865,7 @@ int main(int argc, char *argv[], char *envp[])
                if (errno == EADDRINUSE)
                        dbg("another udevd running, exit");
                else
-                       dbg("error initialising udevd socket: %s", strerror(errno));
+                       dbg("error initializing udevd socket: %s", strerror(errno));
 
                goto exit;
        }