use global udev_log variable instead of parameter in run_program

[elogind.git] / udevstart.c

diff --git a/udevstart.c b/udevstart.c
index 6e1cb050c496318dfb845ef009f80223591a69ba..1e67a0615a9f79a5fd0a4657bc04e0233fce9bb2 100644 (file)
--- a/udevstart.c
+++ b/udevstart.c
@@ -68,7 +68,7 @@ static int device_list_insert(const char *path, struct list_head *device_list)
        struct device *new_device;
        const char *devpath = &path[strlen(sysfs_path)];
 
-       dbg("insert: '%s'\n", devpath);
+       dbg("insert: '%s'", devpath);
 
        list_for_each_entry(loop_device, device_list, node) {
                if (strcmp(loop_device->path, devpath) > 0) {
@@ -120,7 +120,7 @@ static int add_device(const char *devpath)
        if (dev == NULL)
                return -1;
 
-       udev = udev_device_init();
+       udev = udev_device_init(NULL);
        if (udev == NULL)
                return -1;
 
@@ -160,7 +160,7 @@ static int add_device(const char *devpath)
 
                                strlcpy(program, name_loop->name, sizeof(program));
                                udev_rules_apply_format(udev, program, sizeof(program));
-                               run_program(program, udev->dev->subsystem, NULL, 0, NULL, (udev_log_priority >= LOG_INFO));
+                               run_program(program, udev->dev->subsystem, NULL, 0, NULL);
                        }
                }
        }
@@ -367,6 +367,7 @@ int main(int argc, char *argv[], char *envp[])
 
        udev_rules_cleanup(&rules);
        sysfs_cleanup();
+       selinux_exit();
        logging_close();
        return 0;
 }