journalctl: Unify boot id lookup into common function get_boots

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

diff --git a/src/udev/udevd.c b/src/udev/udevd.c
index 9210da6c4798caf48ebaa3804b79617a7b802094..2e6c71352f8776f03c717bdc8af9cb30f6bea679 100644 (file)
--- a/src/udev/udevd.c
+++ b/src/udev/udevd.c
@@ -1060,7 +1060,7 @@ static int parse_argv(int argc, char *argv[]) {
                 case 't':
                         r = safe_atou64(optarg, &arg_event_timeout_usec);
                         if (r < 0)
-                                log_warning("Invalig --event-timeout ignored: %s", optarg);
+                                log_warning("Invalid --event-timeout ignored: %s", optarg);
                         else {
                                 arg_event_timeout_usec *= USEC_PER_SEC;
                                 arg_event_timeout_warn_usec = (arg_event_timeout_usec / 3) ? : 1;
@@ -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;