[PATCH] libsysfs: version 2.0

[elogind.git] / udev.c

diff --git a/udev.c b/udev.c
index 23375b7a3e3af118f7a3a17464a01ccf681edb4c..ce9b42f30db510519cc6c0d9f7f8883cbd15e4cb 100644 (file)
--- a/udev.c
+++ b/udev.c
@@ -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,16 +194,31 @@ 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);
                }
 
-               /* run dev.d/ scripts if we created/deleted a node or changed a netif name */
-               if (udev.devname[0] != '\0') {
+               if (udev.devname[0] != '\0')
                        setenv("DEVNAME", udev.devname, 1);
-                       if (udev_dev_d)
-                               udev_multiplex_directory(&udev, DEVD_DIR, DEVD_SUFFIX);
+
+               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_dev_d && udev.devname[0] != '\0')
+                       udev_multiplex_directory(&udev, DEVD_DIR, DEVD_SUFFIX);
+
        } else if (udev.type == DEV_DEVICE) {
                if (strcmp(action, "add") == 0) {
                        /* wait for sysfs */