chiark / gitweb /
path_id: prepare for new sysfs layout
[elogind.git] / udevd.c
diff --git a/udevd.c b/udevd.c
index e2514e5..02c4887 100644 (file)
--- a/udevd.c
+++ b/udevd.c
 #include <dirent.h>
 #include <fcntl.h>
 #include <syslog.h>
+#include <time.h>
 #include <sys/select.h>
 #include <sys/wait.h>
-#include <sys/time.h>
 #include <sys/types.h>
 #include <sys/socket.h>
 #include <sys/un.h>
-#include <sys/sysinfo.h>
 #include <sys/stat.h>
 #include <sys/ioctl.h>
 #include <linux/types.h>
 #include <linux/netlink.h>
 
-#include "list.h"
-#include "udev_libc_wrapper.h"
 #include "udev.h"
-#include "udev_version.h"
 #include "udev_rules.h"
-#include "udev_utils.h"
 #include "udevd.h"
-#include "logging.h"
 
-/* global variables*/
-struct udev_rules rules;
+static struct udev_rules rules;
 static int udevd_sock;
 static int uevent_netlink_sock;
 static int inotify_fd;
@@ -61,19 +54,14 @@ static pid_t sid;
 
 static int signal_pipe[2] = {-1, -1};
 static volatile int sigchilds_waiting;
-static volatile int run_msg_q;
 static volatile int udev_exit;
 static volatile int reload_config;
-static int init_phase = 1;
 static int run_exec_q;
 static int stop_exec_q;
-static int event_timeout;
 static int max_childs;
 static int max_childs_running;
-static unsigned long long expected_seqnum;
 static char udev_log[32];
 
-static LIST_HEAD(msg_list);
 static LIST_HEAD(exec_list);
 static LIST_HEAD(running_list);
 
@@ -92,69 +80,6 @@ void log_message(int priority, const char *format, ...)
 }
 #endif
 
-static void msg_dump_queue(void)
-{
-#ifdef DEBUG
-       struct uevent_msg *msg;
-
-       list_for_each_entry(msg, &msg_list, node)
-               dbg("sequence %llu in queue", msg->seqnum);
-#endif
-}
-
-static void msg_queue_delete(struct uevent_msg *msg)
-{
-       list_del(&msg->node);
-       free(msg);
-}
-
-/* orders the message in the queue by sequence number */
-static void msg_queue_insert(struct uevent_msg *msg)
-{
-       struct uevent_msg *loop_msg;
-       struct sysinfo info;
-
-       if (msg->seqnum == 0) {
-               dbg("no SEQNUM, move straight to the exec queue");
-               list_add_tail(&msg->node, &exec_list);
-               run_exec_q = 1;
-               return;
-       }
-
-       /* store timestamp of queuing */
-       sysinfo(&info);
-       msg->queue_time = info.uptime;
-
-       /* with the first event we provide a phase of shorter timeout */
-       if (init_phase) {
-               static long init_time;
-
-               if (init_time == 0)
-                       init_time = info.uptime;
-               if (info.uptime - init_time >= UDEVD_INIT_TIME)
-                       init_phase = 0;
-       }
-
-       /* sort message by sequence number into list */
-       list_for_each_entry_reverse(loop_msg, &msg_list, node) {
-               if (loop_msg->seqnum < msg->seqnum)
-                       break;
-
-               if (loop_msg->seqnum == msg->seqnum) {
-                       dbg("ignoring duplicate message seq %llu", msg->seqnum);
-                       free(msg);
-                       return;
-               }
-       }
-       list_add(&msg->node, &loop_msg->node);
-       info("seq %llu queued, '%s' '%s'", msg->seqnum, msg->action, msg->devpath);
-
-       /* run msg queue manager */
-       run_msg_q = 1;
-
-       return;
-}
-
 static void asmlinkage udev_event_sig_handler(int signum)
 {
        if (signum == SIGALRM)
@@ -164,8 +89,7 @@ static void asmlinkage udev_event_sig_handler(int signum)
 static int udev_event_process(struct uevent_msg *msg)
 {
        struct sigaction act;
-       struct udevice udev;
-       struct name_entry *name_loop;
+       struct udevice *udev;
        int i;
        int retval;
 
@@ -176,36 +100,149 @@ static int udev_event_process(struct uevent_msg *msg)
        act.sa_flags = 0;
        sigaction(SIGALRM, &act, NULL);
 
+       /* reset to default */
+       act.sa_handler = SIG_DFL;
+       sigaction(SIGINT, &act, NULL);
+       sigaction(SIGTERM, &act, NULL);
+       sigaction(SIGCHLD, &act, NULL);
+       sigaction(SIGHUP, &act, NULL);
+
        /* trigger timeout to prevent hanging processes */
        alarm(UDEV_ALARM_TIMEOUT);
 
-       /* reconstruct env from message */
+       /* reconstruct event environment from message */
        for (i = 0; msg->envp[i]; i++)
                putenv(msg->envp[i]);
 
-       udev_init_device(&udev, msg->devpath, msg->subsystem, msg->action);
-       retval = udev_process_event(&rules, &udev);
+       udev = udev_device_init();
+       if (udev == NULL)
+               return -1;
+       strlcpy(udev->action, msg->action, sizeof(udev->action));
+       sysfs_device_set_values(udev->dev, msg->devpath, msg->subsystem);
+       udev->devt = msg->devt;
+
+       retval = udev_device_event(&rules, udev);
 
        /* run programs collected by RUN-key*/
-       if (!retval) {
-               list_for_each_entry(name_loop, &udev.run_list, node) {
+       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
-                               run_program(name_loop->name, udev.subsystem, NULL, 0, NULL, (udev_log_priority >= LOG_INFO));
+                               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,
+                                               (udev_log_priority >= LOG_INFO)))
+                                       retval = -1;
+                       }
                }
        }
 
-       udev_cleanup_device(&udev);
+       udev_device_cleanup(udev);
+       return retval;
+}
 
-       return 0;
+enum event_state {
+       EVENT_QUEUED,
+       EVENT_FINISHED,
+       EVENT_FAILED,
+};
+
+static void export_event_state(struct uevent_msg *msg, enum event_state state)
+{
+       char filename[PATH_SIZE];
+       char filename_failed[PATH_SIZE];
+       char target[PATH_SIZE];
+       size_t start, end, i;
+       struct uevent_msg *loop_msg;
+
+       /* add location of queue files */
+       strlcpy(filename, udev_root, sizeof(filename));
+       strlcat(filename, "/", sizeof(filename));
+       start = strlcat(filename, EVENT_QUEUE_DIR, sizeof(filename));
+       end = strlcat(filename, msg->devpath, sizeof(filename));
+       if (end > sizeof(filename))
+               end = sizeof(filename);
+
+       /* replace '/' to transform path into a filename */
+       for (i = start+1; i < end; i++)
+               if (filename[i] == '/')
+                       filename[i] = PATH_TO_NAME_CHAR;
+
+       /* add location of failed files */
+       strlcpy(filename_failed, udev_root, sizeof(filename_failed));
+       strlcat(filename_failed, "/", sizeof(filename_failed));
+       start = strlcat(filename_failed, EVENT_FAILED_DIR, sizeof(filename_failed));
+       end = strlcat(filename_failed, msg->devpath, sizeof(filename_failed));
+       if (end > sizeof(filename_failed))
+               end = sizeof(filename_failed);
+
+       /* replace '/' to transform path into a filename */
+       for (i = start+1; i < end; i++)
+               if (filename_failed[i] == '/')
+                       filename_failed[i] = PATH_TO_NAME_CHAR;
+
+       switch (state) {
+       case EVENT_QUEUED:
+               unlink(filename_failed);
+               delete_path(filename_failed);
+
+               strlcpy(target, sysfs_path, sizeof(target));
+               strlcat(target, msg->devpath, sizeof(target));
+               create_path(filename);
+               symlink(target, filename);
+               return;
+       case EVENT_FINISHED:
+       case EVENT_FAILED:
+               unlink(filename_failed);
+               delete_path(filename_failed);
+
+               /* don't remove, if events for the same path are still pending */
+               list_for_each_entry(loop_msg, &running_list, node)
+                       if (loop_msg->devpath && strcmp(loop_msg->devpath, msg->devpath) == 0)
+                               return;
+
+               list_for_each_entry(loop_msg, &exec_list, node)
+                       if (loop_msg->devpath && strcmp(loop_msg->devpath, msg->devpath) == 0)
+                               return;
+
+               /* move failed events to the failed directory */
+               if (state == EVENT_FAILED) {
+                       create_path(filename_failed);
+                       rename(filename, filename_failed);
+               } else {
+                       unlink(filename);
+               }
+
+               /* clean up the queue directory */
+               delete_path(filename);
+
+               return;
+       }
+}
+
+static void msg_queue_delete(struct uevent_msg *msg)
+{
+       list_del(&msg->node);
+
+       /* mark as failed, if add event returns non-zero */
+       if (msg->exitstatus && strcmp(msg->action, "add") == 0)
+               export_event_state(msg, EVENT_FAILED);
+       else
+               export_event_state(msg, EVENT_FINISHED);
+
+       free(msg);
 }
 
-/* runs event and removes event from run queue when finished */
 static void udev_event_run(struct uevent_msg *msg)
 {
        pid_t pid;
-       struct sysinfo info;
+       int retval;
 
        pid = fork();
        switch (pid) {
@@ -213,7 +250,7 @@ static void udev_event_run(struct uevent_msg *msg)
                /* child */
                close(uevent_netlink_sock);
                close(udevd_sock);
-               if (inotify_fd > 0)
+               if (inotify_fd >= 0)
                        close(inotify_fd);
                close(signal_pipe[READ_END]);
                close(signal_pipe[WRITE_END]);
@@ -221,24 +258,58 @@ static void udev_event_run(struct uevent_msg *msg)
 
                logging_init("udevd-event");
                setpriority(PRIO_PROCESS, 0, UDEV_PRIORITY);
-               udev_event_process(msg);
+               retval = udev_event_process(msg);
                info("seq %llu finished", msg->seqnum);
 
                logging_close();
+               if (retval)
+                       exit(1);
                exit(0);
        case -1:
-               err("fork of child failed");
+               err("fork of child failed: %s", strerror(errno));
                msg_queue_delete(msg);
                break;
        default:
                /* get SIGCHLD in main loop */
-               sysinfo(&info);
                info("seq %llu forked, pid [%d], '%s' '%s', %ld seconds old",
-                    msg->seqnum, pid,  msg->action, msg->subsystem, info.uptime - msg->queue_time);
+                    msg->seqnum, pid,  msg->action, msg->subsystem, time(NULL) - msg->queue_time);
                msg->pid = pid;
        }
 }
 
+static void msg_queue_insert(struct uevent_msg *msg)
+{
+       char filename[PATH_SIZE];
+       int fd;
+
+       msg->queue_time = time(NULL);
+
+       strlcpy(filename, udev_root, sizeof(filename));
+       strlcat(filename, "/" EVENT_SEQNUM, sizeof(filename));
+       fd = open(filename, O_WRONLY|O_TRUNC|O_CREAT, 0644);
+       if (fd >= 0) {
+               char str[32];
+               int len;
+
+               len = sprintf(str, "%llu\n", msg->seqnum);
+               write(fd, str, len);
+               close(fd);
+       }
+
+       export_event_state(msg, EVENT_QUEUED);
+
+       /* run all events with a timeout set immediately */
+       if (msg->timeout != 0) {
+               list_add_tail(&msg->node, &running_list);
+               udev_event_run(msg);
+               return;
+       }
+
+       list_add_tail(&msg->node, &exec_list);
+       run_exec_q = 1;
+}
+
+/* runs event and removes event from run queue when finished */
 static int running_processes(void)
 {
        int f;
@@ -364,20 +435,11 @@ static int running_with_devpath(struct uevent_msg *msg, int limit)
        struct uevent_msg *loop_msg;
        int childs_count = 0;
 
-       if (msg->devpath == NULL)
-               return 0;
-
-       /* skip any events with a timeout set */
-       if (msg->timeout != 0)
-               return 0;
-
        list_for_each_entry(loop_msg, &running_list, node) {
                if (limit && childs_count++ > limit) {
                        dbg("%llu, maximum number (%i) of child reached", msg->seqnum, childs_count);
                        return 1;
                }
-               if (loop_msg->devpath == NULL)
-                       continue;
 
                /* return running parent/child device event */
                if (compare_devpath(loop_msg->devpath, msg->devpath) != 0) {
@@ -399,7 +461,7 @@ static int running_with_devpath(struct uevent_msg *msg, int limit)
 }
 
 /* exec queue management routine executes the events and serializes events in the same sequence */
-static void exec_queue_manager(void)
+static void msg_queue_manager(void)
 {
        struct uevent_msg *loop_msg;
        struct uevent_msg *tmp_msg;
@@ -419,75 +481,22 @@ static void exec_queue_manager(void)
                        running = running_processes_in_session(sid, max_childs_running+10);
                        dbg("at least %d processes running in session", running);
                        if (running >= max_childs_running) {
-                               dbg("delay seq %llu, cause too many processes already running",
-                                   loop_msg->seqnum);
+                               dbg("delay seq %llu, too many processes already running", loop_msg->seqnum);
                                return;
                        }
                }
 
-               if (running_with_devpath(loop_msg, max_childs) == 0) {
-                       /* move event to run list */
-                       list_move_tail(&loop_msg->node, &running_list);
-                       udev_event_run(loop_msg);
-                       running++;
-                       dbg("moved seq %llu to running list", loop_msg->seqnum);
-               } else
+               /* don't run two processes for the same devpath and wait for the parent*/
+               if (running_with_devpath(loop_msg, max_childs)) {
                        dbg("delay seq %llu (%s)", loop_msg->seqnum, loop_msg->devpath);
-       }
-}
-
-static void msg_move_exec(struct uevent_msg *msg)
-{
-       list_move_tail(&msg->node, &exec_list);
-       run_exec_q = 1;
-       expected_seqnum = msg->seqnum+1;
-       dbg("moved seq %llu to exec, next expected is %llu",
-               msg->seqnum, expected_seqnum);
-}
-
-/* msg queue management routine handles the timeouts and dispatches the events */
-static void msg_queue_manager(void)
-{
-       struct uevent_msg *loop_msg;
-       struct uevent_msg *tmp_msg;
-       struct sysinfo info;
-       long msg_age = 0;
-       int timeout = event_timeout;
-
-       dbg("msg queue manager, next expected is %llu", expected_seqnum);
-recheck:
-       sysinfo(&info);
-       list_for_each_entry_safe(loop_msg, tmp_msg, &msg_list, node) {
-               /* move event with expected sequence to the exec list */
-               if (loop_msg->seqnum == expected_seqnum) {
-                       msg_move_exec(loop_msg);
                        continue;
                }
 
-               /* limit timeout during initialization phase */
-               if (init_phase) {
-                       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 */
-               msg_age = info.uptime - loop_msg->queue_time;
-               dbg("seq %llu is %li seconds old", loop_msg->seqnum, msg_age);
-               if (msg_age >= timeout) {
-                       msg_move_exec(loop_msg);
-                       goto recheck;
-               } else
-                       break;
-       }
-
-       msg_dump_queue();
-
-       /* set timeout for remaining queued events */
-       if (!list_empty(&msg_list)) {
-               struct itimerval itv = {{0, 0}, {timeout - msg_age, 0}};
-               info("next event expires in %li seconds", timeout - msg_age);
-               setitimer(ITIMER_REAL, &itv, NULL);
+               /* move event to run list */
+               list_move_tail(&loop_msg->node, &running_list);
+               udev_event_run(loop_msg);
+               running++;
+               dbg("moved seq %llu to running list", loop_msg->seqnum);
        }
 }
 
@@ -539,25 +548,28 @@ 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 == NULL || msg->action == NULL) {
+               info("DEVPATH or ACTION missing, ignore message");
+               free(msg);
+               return NULL;
+       }
        return msg;
 }
 
 /* receive the udevd message from userspace */
 static struct uevent_msg *get_udevd_msg(void)
 {
-       static struct udevd_msg usend_msg;
-       struct uevent_msg *msg;
+       static struct udevd_msg ctrl_msg;
        ssize_t size;
        struct msghdr smsg;
        struct cmsghdr *cmsg;
        struct iovec iov;
        struct ucred *cred;
        char cred_msg[CMSG_SPACE(sizeof(struct ucred))];
-       int envbuf_size;
        int *intval;
 
-       memset(&usend_msg, 0x00, sizeof(struct udevd_msg));
-       iov.iov_base = &usend_msg;
+       memset(&ctrl_msg, 0x00, sizeof(struct udevd_msg));
+       iov.iov_base = &ctrl_msg;
        iov.iov_len = sizeof(struct udevd_msg);
 
        memset(&smsg, 0x00, sizeof(struct msghdr));
@@ -569,7 +581,7 @@ static struct uevent_msg *get_udevd_msg(void)
        size = recvmsg(udevd_sock, &smsg, 0);
        if (size <  0) {
                if (errno != EINTR)
-                       err("unable to receive udevd message");
+                       err("unable to receive user udevd message: %s", strerror(errno));
                return NULL;
        }
        cmsg = CMSG_FIRSTHDR(&smsg);
@@ -585,22 +597,12 @@ static struct uevent_msg *get_udevd_msg(void)
                return NULL;
        }
 
-       if (strncmp(usend_msg.magic, UDEV_MAGIC, sizeof(UDEV_MAGIC)) != 0 ) {
-               err("message magic '%s' doesn't match, ignore it", usend_msg.magic);
+       if (strncmp(ctrl_msg.magic, UDEV_MAGIC, sizeof(UDEV_MAGIC)) != 0 ) {
+               err("message magic '%s' doesn't match, ignore it", ctrl_msg.magic);
                return NULL;
        }
 
-       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);
-               msg = get_msg_from_envbuf(usend_msg.envbuf, envbuf_size);
-               if (msg == NULL)
-                       return NULL;
-               msg->type = usend_msg.type;
-               return msg;
+       switch (ctrl_msg.type) {
        case UDEVD_STOP_EXEC_QUEUE:
                info("udevd message (STOP_EXEC_QUEUE) received");
                stop_exec_q = 1;
@@ -608,17 +610,17 @@ static struct uevent_msg *get_udevd_msg(void)
        case UDEVD_START_EXEC_QUEUE:
                info("udevd message (START_EXEC_QUEUE) received");
                stop_exec_q = 0;
-               exec_queue_manager();
+               msg_queue_manager();
                break;
        case UDEVD_SET_LOG_LEVEL:
-               intval = (int *) usend_msg.envbuf;
+               intval = (int *) ctrl_msg.envbuf;
                info("udevd message (SET_LOG_PRIORITY) received, udev_log_priority=%i", *intval);
                udev_log_priority = *intval;
                sprintf(udev_log, "UDEV_LOG=%i", udev_log_priority);
                putenv(udev_log);
                break;
        case UDEVD_SET_MAX_CHILDS:
-               intval = (int *) usend_msg.envbuf;
+               intval = (int *) ctrl_msg.envbuf;
                info("udevd message (UDEVD_SET_MAX_CHILDS) received, max_childs=%i", *intval);
                max_childs = *intval;
                break;
@@ -638,13 +640,13 @@ 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);
        if (size <  0) {
                if (errno != EINTR)
-                       err("unable to receive udevd message");
+                       err("unable to receive kernel netlink message: %s", strerror(errno));
                return NULL;
        }
 
@@ -691,10 +693,6 @@ static void asmlinkage sig_handler(int signum)
                case SIGTERM:
                        udev_exit = 1;
                        break;
-               case SIGALRM:
-                       /* set flag, then write to pipe if needed */
-                       run_msg_q = 1;
-                       break;
                case SIGCHLD:
                        /* set flag, then write to pipe if needed */
                        sigchilds_waiting = 1;
@@ -708,25 +706,19 @@ static void asmlinkage sig_handler(int signum)
        write(signal_pipe[WRITE_END], "", 1);
 }
 
-static void udev_done(int pid)
+static void udev_done(int pid, int exitstatus)
 {
        /* find msg associated with pid and delete it */
        struct uevent_msg *msg;
-       struct sysinfo info;
 
        list_for_each_entry(msg, &running_list, node) {
                if (msg->pid == pid) {
-                       sysinfo(&info);
-                       if (msg->queue_time)
-                               info("seq %llu, pid [%d] exit, %ld seconds old", msg->seqnum, msg->pid, info.uptime - msg->queue_time);
-                       else
-                               info("seq 0, pid [%d] exit", msg->pid);
+                       info("seq %llu, pid [%d] exit with %i, %ld seconds old", msg->seqnum, msg->pid,
+                            exitstatus, time(NULL) - msg->queue_time);
+                       msg->exitstatus = exitstatus;
                        msg_queue_delete(msg);
 
-                       /* we want to run the exec queue manager since there may
-                        * be events waiting with the devpath of the one that
-                        * just finished
-                        */
+                       /* there may be events waiting with the same devpath */
                        run_exec_q = 1;
                        return;
                }
@@ -736,12 +728,19 @@ static void udev_done(int pid)
 static void reap_sigchilds(void)
 {
        pid_t pid;
+       int status;
 
        while (1) {
-               pid = waitpid(-1, NULL, WNOHANG);
+               pid = waitpid(-1, &status, WNOHANG);
                if (pid <= 0)
                        break;
-               udev_done(pid);
+               if (WIFEXITED(status))
+                       status = WEXITSTATUS(status);
+               else if (WIFSIGNALED(status))
+                       status = WTERMSIG(status) + 128;
+               else
+                       status = 0;
+               udev_done(pid, status);
        }
 }
 
@@ -761,7 +760,7 @@ static int init_udevd_socket(void)
 
        udevd_sock = socket(AF_LOCAL, SOCK_DGRAM, 0);
        if (udevd_sock == -1) {
-               err("error getting socket, %s", strerror(errno));
+               err("error getting socket: %s", strerror(errno));
                return -1;
        }
 
@@ -771,7 +770,7 @@ static int init_udevd_socket(void)
        /* the bind takes care of ensuring only one copy running */
        retval = bind(udevd_sock, (struct sockaddr *) &saddr, addrlen);
        if (retval < 0) {
-               err("bind failed, %s", strerror(errno));
+               err("bind failed: %s", strerror(errno));
                return -1;
        }
 
@@ -794,7 +793,7 @@ static int init_uevent_netlink_sock(void)
 
        uevent_netlink_sock = socket(PF_NETLINK, SOCK_DGRAM, NETLINK_KOBJECT_UEVENT);
        if (uevent_netlink_sock == -1) {
-               err("error getting socket, %s", strerror(errno));
+               err("error getting socket: %s", strerror(errno));
                return -1;
        }
 
@@ -803,7 +802,7 @@ static int init_uevent_netlink_sock(void)
 
        retval = bind(uevent_netlink_sock, (struct sockaddr *) &snl, sizeof(struct sockaddr_nl));
        if (retval < 0) {
-               err("bind failed, %s", strerror(errno));
+               err("bind failed: %s", strerror(errno));
                close(uevent_netlink_sock);
                uevent_netlink_sock = -1;
                return -1;
@@ -811,6 +810,34 @@ static int init_uevent_netlink_sock(void)
        return 0;
 }
 
+static void export_initial_seqnum(void)
+{
+       char filename[PATH_SIZE];
+       int fd;
+       char seqnum[32];
+       ssize_t len = 0;
+
+       strlcpy(filename, sysfs_path, sizeof(filename));
+       strlcat(filename, "/kernel/uevent_seqnum", sizeof(filename));
+       fd = open(filename, O_RDONLY);
+       if (fd >= 0) {
+               len = read(fd, seqnum, sizeof(seqnum)-1);
+               close(fd);
+       }
+       if (len <= 0) {
+               strcpy(seqnum, "0\n");
+               len = 3;
+       }
+       strlcpy(filename, udev_root, sizeof(filename));
+       strlcat(filename, "/" EVENT_SEQNUM, sizeof(filename));
+       create_path(filename);
+       fd = open(filename, O_WRONLY|O_TRUNC|O_CREAT, 0644);
+       if (fd >= 0) {
+               write(fd, seqnum, len);
+               close(fd);
+       }
+}
+
 int main(int argc, char *argv[], char *envp[])
 {
        int retval;
@@ -818,10 +845,10 @@ int main(int argc, char *argv[], char *envp[])
        struct sigaction act;
        fd_set readfds;
        const char *value;
-       int uevent_netlink_active = 0;
        int daemonize = 0;
        int i;
        int rc = 0;
+       int maxfd;
 
        /* redirect std fd's, if the kernel forks us, we don't have them at all */
        fd = open("/dev/null", O_RDWR);
@@ -838,9 +865,9 @@ int main(int argc, char *argv[], char *envp[])
 
        logging_init("udevd");
        if (fd < 0)
-               err("fatal, could not open /dev/null");
+               err("fatal, could not open /dev/null: %s", strerror(errno));
 
-       udev_init_config();
+       udev_config_init();
        dbg("version %s", UDEV_VERSION);
 
        if (getuid() != 0) {
@@ -864,10 +891,10 @@ int main(int argc, char *argv[], char *envp[])
        /* init sockets to receive events */
        if (init_udevd_socket() < 0) {
                if (errno == EADDRINUSE) {
-                       dbg("another udevd running, exit");
+                       err("another udevd running, exit");
                        rc = 1;
                } else {
-                       dbg("error initializing udevd socket: %s", strerror(errno));
+                       err("error initializing udevd socket: %s", strerror(errno));
                        rc = 2;
                }
                goto exit;
@@ -880,7 +907,10 @@ int main(int argc, char *argv[], char *envp[])
        }
 
        /* parse the rules and keep it in memory */
-       udev_rules_init(&rules, 0, 1);
+       sysfs_init();
+       udev_rules_init(&rules, 1);
+
+       export_initial_seqnum();
 
        if (daemonize) {
                pid_t pid;
@@ -891,7 +921,7 @@ int main(int argc, char *argv[], char *envp[])
                        dbg("daemonized fork running");
                        break;
                case -1:
-                       err("fork of daemon failed");
+                       err("fork of daemon failed: %s", strerror(errno));
                        rc = 4;
                        goto exit;
                default:
@@ -904,7 +934,7 @@ int main(int argc, char *argv[], char *envp[])
        setpriority(PRIO_PROCESS, 0, UDEVD_PRIORITY);
 
        chdir("/");
-       umask(077);
+       umask(022);
 
        /* become session leader */
        sid = setsid();
@@ -913,7 +943,7 @@ int main(int argc, char *argv[], char *envp[])
        /* OOM_DISABLE == -17 */
        fd = open("/proc/self/oom_adj", O_RDWR);
        if (fd < 0)
-               err("error disabling OOM");
+               err("error disabling OOM: %s", strerror(errno));
        else {
                write(fd, "-17", 3);
                close(fd);
@@ -925,12 +955,24 @@ int main(int argc, char *argv[], char *envp[])
                err("error getting pipes: %s", strerror(errno));
                goto exit;
        }
-       retval = fcntl(signal_pipe[READ_END], F_SETFL, O_NONBLOCK);
+
+       retval = fcntl(signal_pipe[READ_END], F_GETFL, 0);
+       if (retval < 0) {
+               err("error fcntl on read pipe: %s", strerror(errno));
+               goto exit;
+       }
+       retval = fcntl(signal_pipe[READ_END], F_SETFL, retval | O_NONBLOCK);
        if (retval < 0) {
                err("error fcntl on read pipe: %s", strerror(errno));
                goto exit;
        }
-       retval = fcntl(signal_pipe[WRITE_END], F_SETFL, O_NONBLOCK);
+
+       retval = fcntl(signal_pipe[WRITE_END], F_GETFL, 0);
+       if (retval < 0) {
+               err("error fcntl on write pipe: %s", strerror(errno));
+               goto exit;
+       }
+       retval = fcntl(signal_pipe[WRITE_END], F_SETFL, retval | O_NONBLOCK);
        if (retval < 0) {
                err("error fcntl on write pipe: %s", strerror(errno));
                goto exit;
@@ -943,29 +985,17 @@ int main(int argc, char *argv[], char *envp[])
        act.sa_flags = SA_RESTART;
        sigaction(SIGINT, &act, NULL);
        sigaction(SIGTERM, &act, NULL);
-       sigaction(SIGALRM, &act, NULL);
        sigaction(SIGCHLD, &act, NULL);
        sigaction(SIGHUP, &act, NULL);
 
        /* watch rules directory */
        inotify_fd = inotify_init();
-       if (inotify_fd > 0)
+       if (inotify_fd >= 0)
                inotify_add_watch(inotify_fd, udev_rules_filename, IN_CREATE | IN_DELETE | IN_MOVE | IN_CLOSE_WRITE);
-
-       /* init of expected_seqnum value */
-       value = getenv("UDEVD_EXPECTED_SEQNUM");
-       if (value) {
-               expected_seqnum = strtoull(value, NULL, 10);
-               info("initialize expected_seqnum to %llu", expected_seqnum);
-       }
-
-       /* timeout to wait for missing events */
-       value = getenv("UDEVD_EVENT_TIMEOUT");
-       if (value)
-               event_timeout = strtoul(value, NULL, 10);
+       else if (errno == ENOSYS)
+               err("the kernel does not support inotify, udevd can't monitor configuration file changes");
        else
-               event_timeout = UDEVD_EVENT_TIMEOUT;
-       info("initialize event_timeout to %u", event_timeout);
+               err("inotify_init failed: %s", strerror(errno));
 
        /* maximum limit of forked childs */
        value = getenv("UDEVD_MAX_CHILDS");
@@ -990,6 +1020,11 @@ int main(int argc, char *argv[], char *envp[])
        sprintf(udev_log, "UDEV_LOG=%i", udev_log_priority);
        putenv(udev_log);
 
+       maxfd = udevd_sock;
+       maxfd = UDEV_MAX(maxfd, uevent_netlink_sock);
+       maxfd = UDEV_MAX(maxfd, signal_pipe[READ_END]);
+       maxfd = UDEV_MAX(maxfd, inotify_fd);
+
        while (!udev_exit) {
                struct uevent_msg *msg;
                int fdcount;
@@ -998,40 +1033,28 @@ int main(int argc, char *argv[], char *envp[])
                FD_SET(signal_pipe[READ_END], &readfds);
                FD_SET(udevd_sock, &readfds);
                FD_SET(uevent_netlink_sock, &readfds);
-               if (inotify_fd > 0)
+               if (inotify_fd >= 0)
                        FD_SET(inotify_fd, &readfds);
 
-               fdcount = select(UDEV_MAX(uevent_netlink_sock, inotify_fd)+1, &readfds, NULL, NULL, NULL);
+               fdcount = select(maxfd+1, &readfds, NULL, NULL, NULL);
                if (fdcount < 0) {
                        if (errno != EINTR)
-                               dbg("error in select: %s", strerror(errno));
+                               err("error in select: %s", strerror(errno));
                        continue;
                }
 
                /* get user socket message */
                if (FD_ISSET(udevd_sock, &readfds)) {
                        msg = get_udevd_msg();
-                       if (msg) {
-                               /* discard kernel messages if netlink is active */
-                               if (uevent_netlink_active && msg->type == UDEVD_UEVENT_UDEVSEND && msg->seqnum != 0) {
-                                       info("skip uevent_helper message with SEQNUM, netlink is active");
-                                       free(msg);
-                               } else
-                                       msg_queue_insert(msg);
-                       }
+                       if (msg)
+                               msg_queue_insert(msg);
                }
 
                /* get kernel netlink message */
                if (FD_ISSET(uevent_netlink_sock, &readfds)) {
                        msg = get_netlink_msg();
-                       if (msg) {
+                       if (msg)
                                msg_queue_insert(msg);
-                               /* disable udevsend with first netlink message */
-                               if (!uevent_netlink_active) {
-                                       info("uevent_nl message received, disable udevsend messages");
-                                       uevent_netlink_active = 1;
-                               }
-                       }
                }
 
                /* received a signal, clear our notification pipe */
@@ -1042,7 +1065,7 @@ int main(int argc, char *argv[], char *envp[])
                }
 
                /* rules directory inotify watch */
-               if ((inotify_fd > 0) && FD_ISSET(inotify_fd, &readfds)) {
+               if ((inotify_fd >= 0) && FD_ISSET(inotify_fd, &readfds)) {
                        int nbytes;
 
                        /* discard all possible events, we can just reload the config */
@@ -1064,47 +1087,37 @@ int main(int argc, char *argv[], char *envp[])
                /* rules changed, set by inotify or a signal*/
                if (reload_config) {
                        reload_config = 0;
-                       udev_rules_close(&rules);
-                       udev_rules_init(&rules, 0, 1);
+                       udev_rules_cleanup(&rules);
+                       udev_rules_init(&rules, 1);
                }
 
-               /* forked child have returned */
+               /* forked child has returned */
                if (sigchilds_waiting) {
                        sigchilds_waiting = 0;
                        reap_sigchilds();
                }
 
-               if (run_msg_q) {
-                       run_msg_q = 0;
-                       msg_queue_manager();
-               }
-
                if (run_exec_q) {
-                        /* clean up running_list before calling exec_queue_manager() */
-                       if (sigchilds_waiting) {
-                               sigchilds_waiting = 0;
-                               reap_sigchilds();
-                       }
-
                        run_exec_q = 0;
                        if (!stop_exec_q)
-                               exec_queue_manager();
+                               msg_queue_manager();
                }
        }
 
 exit:
-       udev_rules_close(&rules);
+       udev_rules_cleanup(&rules);
+       sysfs_cleanup();
 
-       if (signal_pipe[READ_END] > 0)
+       if (signal_pipe[READ_END] >= 0)
                close(signal_pipe[READ_END]);
-       if (signal_pipe[WRITE_END] > 0)
+       if (signal_pipe[WRITE_END] >= 0)
                close(signal_pipe[WRITE_END]);
 
-       if (udevd_sock > 0)
+       if (udevd_sock >= 0)
                close(udevd_sock);
-       if (inotify_fd > 0)
+       if (inotify_fd >= 0)
                close(inotify_fd);
-       if (uevent_netlink_sock > 0)
+       if (uevent_netlink_sock >= 0)
                close(uevent_netlink_sock);
 
        logging_close();