rules: make ata_id properties the default for all ATA block devices

[elogind.git] / udev / udevd.c

diff --git a/udev/udevd.c b/udev/udevd.c
index e7a0c9840aba4b23e71b0e36877c78bcf3bbdb6b..b2e4a022c5c0e9ece1807a198410470e8d00cdae 100644 (file)
--- a/udev/udevd.c
+++ b/udev/udevd.c
@@ -213,8 +213,8 @@ static void worker_new(struct event *event)
                udev_ctrl_unref(udev_ctrl);
                close(pfd[FD_SIGNAL].fd);
                close(worker_watch[READ_END]);
-               logging_close();
-               logging_init("udevd-work");
+               udev_log_close();
+               udev_log_init("udevd-work");
                setpriority(PRIO_PROCESS, 0, UDEV_PRIORITY);
 
                /* set signal handlers */
@@ -288,7 +288,7 @@ static void worker_new(struct event *event)
                }
 
                udev_monitor_unref(worker_monitor);
-               logging_close();
+               udev_log_close();
                exit(0);
        }
        case -1:
@@ -307,6 +307,7 @@ static void worker_new(struct event *event)
                event->state = EVENT_RUNNING;
                udev_list_node_append(&worker->node, &worker_list);
                childs++;
+               info(event->udev, "seq %llu forked new worker [%u]\n", udev_device_get_seqnum(event->dev), pid);
                break;
        }
 }
@@ -701,6 +702,7 @@ static void handle_signal(struct udev *udev, int signo)
                                udev_list_node_remove(&worker->node);
                                worker_unref(worker);
                                childs--;
+                               info(udev, "worker [%u] exit\n", pid);
                                break;
                        }
                }
@@ -761,7 +763,7 @@ int main(int argc, char *argv[])
        if (udev == NULL)
                goto exit;
 
-       logging_init("udevd");
+       udev_log_init("udevd");
        udev_set_log_fn(udev, log_fn);
        info(udev, "version %s\n", VERSION);
        udev_selinux_init(udev);
@@ -867,7 +869,7 @@ int main(int argc, char *argv[])
        } else {
                char filename[UTIL_PATH_SIZE];
 
-               inotify_add_watch(pfd[FD_INOTIFY].fd, UDEV_PREFIX "/lib/udev/rules.d",
+               inotify_add_watch(pfd[FD_INOTIFY].fd, LIBEXECDIR "/rules.d",
                                  IN_CREATE | IN_DELETE | IN_MOVE | IN_CLOSE_WRITE);
                inotify_add_watch(pfd[FD_INOTIFY].fd, SYSCONFDIR "/udev/rules.d",
                                  IN_CREATE | IN_DELETE | IN_MOVE | IN_CLOSE_WRITE);
@@ -1067,6 +1069,6 @@ exit:
        udev_monitor_unref(monitor);
        udev_selinux_exit(udev);
        udev_unref(udev);
-       logging_close();
+       udev_log_close();
        return rc;
 }