volume_id: split raid and filesystem detection

[elogind.git] / udev.c

diff --git a/udev.c b/udev.c
index f808abf427c61c45abecb4cdafd75c5cf727094c..17ab635f1ea07dd91eacbf046742d890f907c6e9 100644 (file)
--- a/udev.c
+++ b/udev.c
@@ -154,7 +154,7 @@ int main(int argc, char *argv[], char *envp[])
 
        retval = udev_device_event(&rules, udev);
 
-       if (!retval && udev_run && !list_empty(&udev->run_list)) {
+       if (retval == 0 && !udev->ignore_device && udev_run) {
                struct name_entry *name_loop;
 
                dbg("executing run list");
@@ -165,7 +165,7 @@ int main(int argc, char *argv[], char *envp[])
                                char program[PATH_SIZE];
 
                                strlcpy(program, name_loop->name, sizeof(program));
-                               apply_format(udev, program, sizeof(program));
+                               udev_rules_apply_format(udev, program, sizeof(program));
                                run_program(program, udev->dev->subsystem, NULL, 0, NULL, (udev_log_priority >= LOG_INFO));
                        }
                }
@@ -178,5 +178,7 @@ fail:
 
 exit:
        logging_close();
-       return retval;
+       if (retval != 0)
+               return 1;
+       return 0;
 }