scsi_id: make sure, we do not have slashes in values

[elogind.git] / udev / udevd.c

diff --git a/udev/udevd.c b/udev/udevd.c
index 15a197e561e1674d91b478b072763f2baff9f374..bfd732319d36862c4d5a371ce10093d1ab362188 100644 (file)
--- a/udev/udevd.c
+++ b/udev/udevd.c
@@ -864,7 +864,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");
 
@@ -974,21 +974,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);
-       cleanup_queue_dir(udev);
        udev_selinux_exit(udev);
        udev_unref(udev);
        logging_close();