Expose delayed name resolution

[elogind.git] / udev / udevd.c

diff --git a/udev/udevd.c b/udev/udevd.c
index bfd732319d36862c4d5a371ce10093d1ab362188..4d6f465f96f41d4b6022f8653f3bdbc27d0f0022 100644 (file)
--- a/udev/udevd.c
+++ b/udev/udevd.c
@@ -639,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;
@@ -678,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);
@@ -759,7 +774,7 @@ 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;
@@ -823,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));
                        }
@@ -956,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;