add inotify support for hppa and MIPS and log if inotify is not available

[elogind.git] / udevd.c

diff --git a/udevd.c b/udevd.c
index 3f4605ed1196af539a1757504ae39c763b400faf..2129d3c66a3751c906ecf3e908ae10b737c67876 100644 (file)
--- a/udevd.c
+++ b/udevd.c
@@ -100,6 +100,13 @@ 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);
 
@@ -200,6 +207,10 @@ static void export_event_state(struct uevent_msg *msg, enum event_state state)
                        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);
@@ -268,8 +279,23 @@ static void udev_event_run(struct uevent_msg *msg)
 
 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 */
@@ -910,12 +936,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;
@@ -933,8 +971,12 @@ int main(int argc, char *argv[], char *envp[])
 
        /* 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);
+       else if (errno == ENOSYS)
+               err("the kernel does not support inotify, udevd can't monitor configuration file changes");
+       else
+               err("inotify_init failed: %s", strerror(errno));
 
        /* maximum limit of forked childs */
        value = getenv("UDEVD_MAX_CHILDS");