[PATCH] add RUN key to be able to run rule based notification

[elogind.git] / udev.c

diff --git a/udev.c b/udev.c
index 6d1d679d9a0ccd446f988cb605c407dd545c123f..5728be59e0d435c8107cfa803957cc971854ead8 100644 (file)
--- a/udev.c
+++ b/udev.c
@@ -141,7 +141,7 @@ int main(int argc, char *argv[], char *envp[])
        if (!subsystem && argc == 2)
                subsystem = argv[1];
 
-       udev_init_device(&udev, devpath, subsystem);
+       udev_init_device(&udev, devpath, subsystem, action);
 
        if (!action || !subsystem || !devpath) {
                err("action, subsystem or devpath missing");
@@ -157,6 +157,8 @@ int main(int argc, char *argv[], char *envp[])
        }
 
        if (udev.type == DEV_BLOCK || udev.type == DEV_CLASS || udev.type == DEV_NET) {
+               udev_rules_init();
+
                if (strcmp(action, "add") == 0) {
                        /* wait for sysfs and possibly add node */
                        dbg("udev add");
@@ -178,9 +180,6 @@ int main(int argc, char *argv[], char *envp[])
 
                        wait_for_class_device(class_dev, &error);
 
-                       /* init rules */
-                       udev_rules_init();
-
                        /* name, create node, store in db */
                        retval = udev_add_device(&udev, class_dev);
 
@@ -195,10 +194,24 @@ int main(int argc, char *argv[], char *envp[])
                                goto hotplug;
                        }
 
+                       udev_rules_get_run(&udev);
+                       if (udev.ignore_device) {
+                               dbg("device event will be ignored");
+                               goto hotplug;
+                       }
+
                        /* get node from db, remove db-entry, delete created node */
                        retval = udev_remove_device(&udev);
                }
 
+               if (udev_run && !list_empty(&udev.run_list)) {
+                       struct name_entry *name_loop;
+
+                       dbg("executing run list");
+                       list_for_each_entry(name_loop, &udev.run_list, node)
+                               execute_command(name_loop->name, udev.subsystem);
+               }
+
                /* run dev.d/ scripts if we created/deleted a node or changed a netif name */
                if (udev.devname[0] != '\0') {
                        setenv("DEVNAME", udev.devname, 1);
@@ -230,10 +243,11 @@ int main(int argc, char *argv[], char *envp[])
        }
 
 hotplug:
-       udev_cleanup_device(&udev);
        if (udev_hotplug_d && managed_event)
                udev_multiplex_directory(&udev, HOTPLUGD_DIR, HOTPLUG_SUFFIX);
 
+       udev_cleanup_device(&udev);
+
        logging_close();
        return retval;
 }