Expose delayed name resolution

[elogind.git] / udev / udevd.c

diff --git a/udev/udevd.c b/udev/udevd.c
index 405a1ed9071290dd13ffbb1d0ea81fe1fd911dc1..4d6f465f96f41d4b6022f8653f3bdbc27d0f0022 100644 (file)
--- a/udev/udevd.c
+++ b/udev/udevd.c
@@ -27,6 +27,7 @@
 #include <fcntl.h>
 #include <time.h>
 #include <getopt.h>
+#include <dirent.h>
 #include <sys/select.h>
 #include <sys/wait.h>
 #include <sys/stat.h>
@@ -569,6 +570,38 @@ static void reap_sigchilds(void)
        }
 }
 
+static void cleanup_queue_dir(struct udev *udev)
+{
+       char dirname[UTIL_PATH_SIZE];
+       char filename[UTIL_PATH_SIZE];
+       DIR *dir;
+
+       util_strlcpy(filename, udev_get_dev_path(udev), sizeof(filename));
+       util_strlcat(filename, "/.udev/uevent_seqnum", sizeof(filename));
+       unlink(filename);
+
+       util_strlcpy(dirname, udev_get_dev_path(udev), sizeof(dirname));
+       util_strlcat(dirname, "/.udev/queue", sizeof(dirname));
+       dir = opendir(dirname);
+       if (dir != NULL) {
+               while (1) {
+                       struct dirent *dent;
+
+                       dent = readdir(dir);
+                       if (dent == NULL || dent->d_name[0] == '\0')
+                               break;
+                       if (dent->d_name[0] == '.')
+                               continue;
+                       util_strlcpy(filename, dirname, sizeof(filename));
+                       util_strlcat(filename, "/", sizeof(filename));
+                       util_strlcat(filename, dent->d_name, sizeof(filename));
+                       unlink(filename);
+               }
+               closedir(dir);
+               rmdir(dirname);
+       }
+}
+
 static void export_initial_seqnum(struct udev *udev)
 {
        char filename[UTIL_PATH_SIZE];
@@ -606,12 +639,14 @@ int main(int argc, char *argv[])
        fd_set readfds;
        const char *value;
        int daemonize = 0;
+       int resolve_names = 1;
        static const struct option options[] = {
                { "daemon", no_argument, NULL, 'd' },
                { "debug-trace", no_argument, NULL, 't' },
                { "debug", no_argument, NULL, 'D' },
                { "help", no_argument, NULL, 'h' },
                { "version", no_argument, NULL, 'V' },
+               { "resolve-names", required_argument, NULL, 'N' },
                {}
        };
        int rc = 1;
@@ -645,8 +680,21 @@ int main(int argc, char *argv[])
                        if (udev_get_log_priority(udev) < LOG_INFO)
                                udev_set_log_priority(udev, LOG_INFO);
                        break;
+               case 'N':
+                       if (strcmp (optarg, "early") == 0) {
+                               resolve_names = 1;
+                       } else if (strcmp (optarg, "late") == 0) {
+                               resolve_names = 0;
+                       } else if (strcmp (optarg, "never") == 0) {
+                               resolve_names = -1;
+                       } else {
+                               fprintf(stderr, "resolve-names must be early, late or never\n");
+                               err(udev, "resolve-names must be early, late or never\n");
+                               goto exit;
+                       }
+                       break;
                case 'h':
-                       printf("Usage: udevd [--help] [--daemon] [--debug-trace] [--debug] [--version]\n");
+                       printf("Usage: udevd [--help] [--daemon] [--debug-trace] [--debug] [--resolve-names=early|late|never] [--version]\n");
                        goto exit;
                case 'V':
                        printf("%s\n", VERSION);
@@ -726,12 +774,13 @@ int main(int argc, char *argv[])
                goto exit;
        }
 
-       rules = udev_rules_new(udev, 1);
+       rules = udev_rules_new(udev, resolve_names);
        if (rules == NULL) {
                err(udev, "error reading rules\n");
                goto exit;
        }
        udev_list_init(&event_list);
+       cleanup_queue_dir(udev);
        export_initial_seqnum(udev);
 
        if (daemonize) {
@@ -789,9 +838,10 @@ int main(int argc, char *argv[])
                util_strlcat(path, "/class/mem/null", sizeof(path));
                if (lstat(path, &statbuf) == 0) {
                        if (S_ISDIR(statbuf.st_mode)) {
-                               const char *depr_str = "<6>udev: deprecated sysfs layout (kernel too old, "
-                                                       "or CONFIG_SYSFS_DEPRECATED) is unsupported, some "
-                                                       "udev features may fail\n";
+                               const char *depr_str =
+                                       "<6>udev: deprecated sysfs layout; update the kernel or "
+                                       "disable CONFIG_SYSFS_DEPRECATED; some udev features will "
+                                       "not work correctly\n";
 
                                write(fd, depr_str, strlen(depr_str));
                        }
@@ -830,7 +880,7 @@ int main(int argc, char *argv[])
                                          IN_CREATE | IN_DELETE | IN_MOVE | IN_CLOSE_WRITE);
                }
        } else if (errno == ENOSYS)
-               err(udev, "the kernel does not support inotify, udevd can't monitor rules file changes\n");
+               info(udev, "unable to use inotify, udevd will not monitor rule files changes\n");
        else
                err(udev, "inotify_init failed: %m\n");
 
@@ -922,7 +972,7 @@ int main(int argc, char *argv[])
                        struct udev_rules *rules_new;
 
                        reload_config = 0;
-                       rules_new = udev_rules_new(udev, 1);
+                       rules_new = udev_rules_new(udev, resolve_names);
                        if (rules_new != NULL) {
                                udev_rules_unref(rules);
                                rules = rules_new;
@@ -940,21 +990,18 @@ int main(int argc, char *argv[])
                                event_queue_manager(udev);
                }
        }
+       cleanup_queue_dir(udev);
        rc = 0;
-
 exit:
        udev_rules_unref(rules);
-
        if (signal_pipe[READ_END] >= 0)
                close(signal_pipe[READ_END]);
        if (signal_pipe[WRITE_END] >= 0)
                close(signal_pipe[WRITE_END]);
-
        udev_ctrl_unref(udev_ctrl);
        if (inotify_fd >= 0)
                close(inotify_fd);
        udev_monitor_unref(kernel_monitor);
-
        udev_selinux_exit(udev);
        udev_unref(udev);
        logging_close();