summaryrefslogtreecommitdiff
path: root/src/udev/udevd.c
diff options
context:
space:
mode:
authorTom Gundersen <teg@jklm.no>2015-05-13 11:39:45 +0200
committerTom Gundersen <teg@jklm.no>2015-05-18 23:49:35 +0200
commitb2d21d9318497517519956ab9994f2303aa0223e (patch)
tree2305582a5e3136eb37e4dd060e2ad2ce813c8075 /src/udev/udevd.c
parente237d8cb0e5488eef311ca1eafe48e8a2248b04c (diff)
udevd: init/exit the builtins in manager_new/free
No functional change.
Diffstat (limited to 'src/udev/udevd.c')
-rw-r--r--src/udev/udevd.c9
1 files changed, 4 insertions, 5 deletions
diff --git a/src/udev/udevd.c b/src/udev/udevd.c
index a555026c9c..892637f052 100644
--- a/src/udev/udevd.c
+++ b/src/udev/udevd.c
@@ -244,6 +244,8 @@ static void manager_free(Manager *manager) {
if (!manager)
return;
+ udev_builtin_exit(manager->udev);
+
udev_unref(manager->udev);
manager_workers_free(manager);
event_queue_cleanup(manager, EVENT_UNDEF);
@@ -471,7 +473,6 @@ skip:
out:
udev_device_unref(dev);
manager_free(manager);
- udev_builtin_exit(udev);
log_close();
_exit(r < 0 ? EXIT_FAILURE : EXIT_SUCCESS);
}
@@ -1288,6 +1289,8 @@ static int manager_new(Manager **ret) {
if (!manager->udev)
return log_error_errno(errno, "could not allocate udev context: %m");
+ udev_builtin_init(manager->udev);
+
manager->rules = udev_rules_new(manager->udev, arg_resolve_names);
if (!manager->rules)
return log_error_errno(ENOMEM, "error reading rules");
@@ -1464,8 +1467,6 @@ int main(int argc, char *argv[]) {
log_info("starting version " VERSION);
- udev_builtin_init(manager->udev);
-
r = udev_rules_apply_static_dev_perms(manager->rules);
if (r < 0)
log_error_errno(r, "failed to apply permissions on static device nodes: %m");
@@ -1676,8 +1677,6 @@ exit:
if (manager)
udev_ctrl_cleanup(manager->ctrl);
exit_daemonize:
- if (manager)
- udev_builtin_exit(manager->udev);
mac_selinux_finish();
log_close();
return r < 0 ? EXIT_FAILURE : EXIT_SUCCESS;