rule-generator: net - whitelist NICs that violate MAC local scheme

[elogind.git] / udev / udev-event.c

diff --git a/udev/udev-event.c b/udev/udev-event.c
index e34f09cfe3dc156d7f815d9eb319b60e2678626f..b7cdbf3402943126947af6e6d027766a6700461f 100644 (file)
--- a/udev/udev-event.c
+++ b/udev/udev-event.c
@@ -550,6 +550,16 @@ int udev_event_execute_rules(struct udev_event *event, struct udev_rules *rules)
 
                dbg(event->udev, "device node add '%s'\n", udev_device_get_devpath(dev));
 
+               /* read old database entry */
+               dev_old = udev_device_new_from_syspath(event->udev, udev_device_get_syspath(dev));
+               if (dev_old != NULL) {
+                       udev_device_read_db(dev_old);
+                       udev_device_set_info_loaded(dev_old);
+
+                       /* disable watch during event processing */
+                       udev_watch_end(event->udev, dev_old);
+               }
+
                udev_rules_apply_to_event(rules, event);
                if (event->tmp_node != NULL) {
                        dbg(event->udev, "removing temporary device node\n");
@@ -560,21 +570,33 @@ int udev_event_execute_rules(struct udev_event *event, struct udev_rules *rules)
 
                if (event->ignore_device) {
                        info(event->udev, "device event will be ignored\n");
-                       goto exit;
+                       goto exit_add;
                }
 
                if (event->name != NULL && event->name[0] == '\0') {
                        info(event->udev, "device node creation supressed\n");
-                       goto exit;
+                       goto exit_add;
                }
 
                if (event->name == NULL) {
-                       info(event->udev, "no node name set, will use kernel name '%s'\n",
+                       const char *devname;
+
+                       devname = udev_device_get_property_value(event->dev, "DEVNAME");
+                       if (devname != NULL) {
+                               info(event->udev, "no node name set, will use "
+                                    "kernel supplied name '%s'\n", devname);
+                               event->name = strdup(devname);
+                               if (event->name == NULL)
+                                       goto exit_add;
+                       }
+               }
+               if (event->name == NULL) {
+                       info(event->udev, "no node name set, will use device name '%s'\n",
                             udev_device_get_sysname(event->dev));
                        event->name = strdup(udev_device_get_sysname(event->dev));
-                       if (event->name == NULL)
-                               goto exit;
                }
+               if (event->name == NULL)
+                       goto exit_add;
 
                /* set device node name */
                util_strlcpy(filename, udev_get_dev_path(event->udev), sizeof(filename));
@@ -582,24 +604,17 @@ int udev_event_execute_rules(struct udev_event *event, struct udev_rules *rules)
                util_strlcat(filename, event->name, sizeof(filename));
                udev_device_set_devnode(dev, filename);
 
-               /* read old database entry */
-               dev_old = udev_device_new_from_syspath(event->udev, udev_device_get_syspath(dev));
-               if (dev_old != NULL) {
-                       udev_device_read_db(dev_old);
-                       udev_device_set_info_loaded(dev_old);
-               }
-
                /* write current database entry */
                udev_device_update_db(dev);
 
                /* remove/update possible left-over symlinks from old database entry */
-               if (dev_old != NULL) {
+               if (dev_old != NULL)
                        udev_node_update_old_links(dev, dev_old);
-                       udev_device_unref(dev_old);
-               }
 
                /* create new node and symlinks */
                err = udev_node_add(dev, event->mode, event->uid, event->gid);
+exit_add:
+               udev_device_unref(dev_old);
                goto exit;
        }
 
@@ -651,6 +666,9 @@ int udev_event_execute_rules(struct udev_event *event, struct udev_rules *rules)
                udev_device_set_info_loaded(dev);
                udev_device_delete_db(dev);
 
+               /* remove watch */
+               udev_watch_end(event->udev, dev);
+
                if (udev_device_get_devnode(dev) == NULL) {
                        char devnode[UTIL_PATH_SIZE];