connect /sys and /dev with /sys/dev/{block,char}/<maj>:<min> and /dev/{block,char...

[elogind.git] / udev / udevd.c

diff --git a/udev/udevd.c b/udev/udevd.c
index 9783fe4e7c545db6bc37e450c06050ea57747870..ee686c6eb7dedb480425f7c6e94cb09bbefce8e4 100644 (file)
--- a/udev/udevd.c
+++ b/udev/udevd.c
@@ -784,11 +784,11 @@ int main(int argc, char *argv[])
        const char *value;
        int daemonize = 0;
        static const struct option options[] = {
-               { "daemon", 0, NULL, 'd' },
-               { "debug-trace", 0, NULL, 't' },
-               { "debug", 0, NULL, 'D' },
-               { "help", 0, NULL, 'h' },
-               { "version", 0, NULL, 'V' },
+               { "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' },
                {}
        };
        int rc = 1;
@@ -801,6 +801,7 @@ int main(int argc, char *argv[])
        logging_init("udevd");
        udev_set_log_fn(udev, log_fn);
        dbg(udev, "version %s\n", VERSION);
+       selinux_init(udev);
 
        while (1) {
                int option;
@@ -962,8 +963,9 @@ 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 "
-                                                      "(CONFIG_SYSFS_DEPRECATED) is unsupported\n";
+                               const char *depr_str = "<6>udev: deprecated sysfs layout (kernel too old, "
+                                                       "or CONFIG_SYSFS_DEPRECATED) is unsupported, some "
+                                                       "udev features may fail\n";
 
                                write(fd, depr_str, strlen(depr_str));
                        }
@@ -1125,6 +1127,8 @@ exit:
        if (uevent_netlink_sock >= 0)
                close(uevent_netlink_sock);
 
+       selinux_exit(udev);
+       udev_unref(udev);
        logging_close();
        return rc;
 }