unlink old database file before creating a new one

[elogind.git] / udevd.c

diff --git a/udevd.c b/udevd.c
index eb632bd85242d32a29e772efcb30da7349c02a87..8c550d38aa3b8f2154c2fc0a073ac75811d6476d 100644 (file)
--- a/udevd.c
+++ b/udevd.c
@@ -45,6 +45,7 @@
 #include "udevd.h"
 #include "udev_selinux.h"
 
+static int debug_trace;
 static int verbose;
 
 static struct udev_rules rules;
@@ -307,6 +308,15 @@ static void msg_queue_insert(struct udevd_uevent_msg *msg)
 
        export_event_state(msg, EVENT_QUEUED);
 
+       /* run one event after the other in debug mode */
+       if (debug_trace) {
+               list_add_tail(&msg->node, &running_list);
+               udev_event_run(msg);
+               waitpid(msg->pid, NULL, 0);
+               msg_queue_delete(msg);
+               return;
+       }
+
        /* run all events with a timeout set immediately */
        if (msg->timeout != 0) {
                list_add_tail(&msg->node, &running_list);
@@ -930,6 +940,7 @@ int main(int argc, char *argv[], char *envp[])
        int option;
        static const struct option options[] = {
                { "daemon", 0, NULL, 'd' },
+               { "debug-trace", 0, NULL, 't' },
                { "verbose", 0, NULL, 'v' },
                { "help", 0, NULL, 'h' },
                {}
@@ -952,13 +963,16 @@ int main(int argc, char *argv[], char *envp[])
                case 'd':
                        daemonize = 1;
                        break;
+               case 't':
+                       debug_trace = 1;
+                       break;
                case 'v':
                        verbose = 1;
                        if (udev_log_priority < LOG_INFO)
                                udev_log_priority = LOG_INFO;
                        break;
                case 'h':
-                       printf("Usage: udevd [--help] [--daemon] [--verbose]\n");
+                       printf("Usage: udevd [--help] [--daemon] [--debug-trace] [--verbose]\n");
                        goto exit;
                default:
                        goto exit;
@@ -992,6 +1006,35 @@ int main(int argc, char *argv[], char *envp[])
                goto exit;
        }
 
+       /* setup signal handler pipe */
+       retval = pipe(signal_pipe);
+       if (retval < 0) {
+               err("error getting pipes: %s", strerror(errno));
+               goto exit;
+       }
+
+       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_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;
+       }
+
        /* parse the rules and keep them in memory */
        sysfs_init();
        udev_rules_init(&rules, 1);
@@ -1048,35 +1091,6 @@ int main(int argc, char *argv[], char *envp[])
                close(fd);
        }
 
-       /* setup signal handler pipe */
-       retval = pipe(signal_pipe);
-       if (retval < 0) {
-               err("error getting pipes: %s", strerror(errno));
-               goto exit;
-       }
-
-       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_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;
-       }
-
        /* set signal handlers */
        memset(&act, 0x00, sizeof(struct sigaction));
        act.sa_handler = (void (*)(int)) sig_handler;
@@ -1090,7 +1104,7 @@ int main(int argc, char *argv[], char *envp[])
        /* watch rules directory */
        inotify_fd = inotify_init();
        if (inotify_fd >= 0)
-               inotify_add_watch(inotify_fd, udev_rules_filename, IN_CREATE | IN_DELETE | IN_MOVE | IN_CLOSE_WRITE);
+               inotify_add_watch(inotify_fd, udev_rules_dir, 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
@@ -1128,6 +1142,8 @@ int main(int argc, char *argv[], char *envp[])
        /* export log_priority , as called programs may want to follow that setting */
        sprintf(udev_log, "UDEV_LOG=%i", udev_log_priority);
        putenv(udev_log);
+       if (debug_trace)
+               putenv("DEBUG=1");
 
        maxfd = udevd_sock;
        maxfd = UDEV_MAX(maxfd, uevent_netlink_sock);