udev: Fix parsing of udev.event-timeout kernel parameter.

[elogind.git] / src / udev / udevd.c

diff --git a/src/udev/udevd.c b/src/udev/udevd.c
index 37db81c8bba9ba0f8c2a0ae32f7291333100fcf3..193702cd288303f4142e67fabc132990ff084082 100644 (file)
--- a/src/udev/udevd.c
+++ b/src/udev/udevd.c
@@ -994,9 +994,9 @@ static void kernel_cmdline_options(struct udev *udev) {
                         if (r < 0)
                                 log_warning("Invalid udev.exec-delay ignored: %s", opt + 16);
                 } else if (startswith(opt, "udev.event-timeout=")) {
-                        r = safe_atou64(opt + 16, &arg_event_timeout_usec);
+                        r = safe_atou64(opt + 19, &arg_event_timeout_usec);
                         if (r < 0) {
-                                log_warning("Invalid udev.event-timeout ignored: %s", opt + 16);
+                                log_warning("Invalid udev.event-timeout ignored: %s", opt + 19);
                                 break;
                         }
                         arg_event_timeout_usec *= USEC_PER_SEC;
@@ -1139,7 +1139,7 @@ int main(int argc, char *argv[]) {
                 goto exit;
         }
 
-        r = label_init("/dev");
+        r = mac_selinux_init("/dev");
         if (r < 0) {
                 log_error("could not initialize labelling: %s", strerror(-r));
                 goto exit;
@@ -1155,7 +1155,7 @@ int main(int argc, char *argv[]) {
         umask(022);
 
         r = mkdir("/run/udev", 0755);
-        if (r < 0) {
+        if (r < 0 && errno != EEXIST) {
                 log_error("could not create /run/udev: %m");
                 goto exit;
         }
@@ -1542,7 +1542,7 @@ exit_daemonize:
         udev_monitor_unref(monitor);
         udev_ctrl_connection_unref(ctrl_conn);
         udev_ctrl_unref(udev_ctrl);
-        label_finish();
+        mac_selinux_finish();
         udev_unref(udev);
         log_close();
         return rc;