create_floppy_devices: fix logic for more than one floppy device

[elogind.git] / test-udev.c

diff --git a/test-udev.c b/test-udev.c
index bbe50eeeb4c542f6d8be634026da91098b97c6e4..0c25778aa68d5ba1c96e3b43e6e765bcb00a6aa0 100644 (file)
--- a/test-udev.c
+++ b/test-udev.c
@@ -136,7 +136,7 @@ int main(int argc, char *argv[], char *envp[])
                goto fail;
        }
 
-       udev = udev_device_init();
+       udev = udev_device_init(NULL);
        if (udev == NULL)
                goto fail;
 
@@ -154,27 +154,14 @@ int main(int argc, char *argv[], char *envp[])
 
        retval = udev_device_event(&rules, udev);
 
-       if (retval == 0 && !udev->ignore_device && udev_run) {
-               struct name_entry *name_loop;
-
-               dbg("executing run list");
-               list_for_each_entry(name_loop, &udev->run_list, node) {
-                       if (strncmp(name_loop->name, "socket:", strlen("socket:")) == 0)
-                               pass_env_to_socket(&name_loop->name[strlen("socket:")], devpath, action);
-                       else {
-                               char program[PATH_SIZE];
-
-                               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));
-                       }
-               }
-       }
+       if (retval == 0 && !udev->ignore_device && udev_run)
+               udev_rules_run(udev);
 
        udev_device_cleanup(udev);
 fail:
        udev_rules_cleanup(&rules);
        sysfs_cleanup();
+       selinux_exit();
 
 exit:
        logging_close();