selinux_init(udev) -> udev_selinux_init(udev)

[elogind.git] / udev / udevd.c

diff --git a/udev/udevd.c b/udev/udevd.c
index d5c12ad56c0258d73507a8a2994de34abb5339de..4f46b6c1a9cf9ac13dfd824fb57c17953fe36e8d 100644 (file)
--- a/udev/udevd.c
+++ b/udev/udevd.c
@@ -212,7 +212,7 @@ static void event_fork(struct udev_event *event)
                alarm(UDEV_EVENT_TIMEOUT);
 
                /* apply rules, create node, symlinks */
-               err = udev_event_run(event, rules);
+               err = udev_event_execute_rules(event, rules);
 
                /* rules may change/disable the timeout */
                if (udev_device_get_event_timeout(event->dev) >= 0)
@@ -220,7 +220,7 @@ static void event_fork(struct udev_event *event)
 
                /* execute RUN= */
                if (err == 0 && !event->ignore_device && udev_get_run(event->udev))
-                       udev_rules_run(event);
+                       udev_event_execute_run(event);
                info(event->udev, "seq %llu exit with %i\n", udev_device_get_seqnum(event->dev), err);
                logging_close();
                if (err != 0)
@@ -648,7 +648,7 @@ int main(int argc, char *argv[])
        logging_init("udevd");
        udev_set_log_fn(udev, log_fn);
        info(udev, "version %s\n", VERSION);
-       selinux_init(udev);
+       udev_selinux_init(udev);
 
        while (1) {
                int option;
@@ -978,7 +978,7 @@ exit:
                close(inotify_fd);
        udev_monitor_unref(kernel_monitor);
 
-       selinux_exit(udev);
+       udev_selinux_exit(udev);
        udev_unref(udev);
        logging_close();
        return rc;