accept DEVNAME from the kernel as a hint for the node name

diff --git a/udev/udev-event.c b/udev/udev-event.c
index f4d71217933b0f89f2f169906a00f032009ff4e5..b7cdbf3402943126947af6e6d027766a6700461f 100644 (file)
--- a/udev/udev-event.c
+++ b/udev/udev-event.c
@@ -579,12 +579,24 @@ int udev_event_execute_rules(struct udev_event *event, struct udev_rules *rules)
                }
 
                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_add;
                }
+               if (event->name == NULL)
+                       goto exit_add;
 
                /* set device node name */
                util_strlcpy(filename, udev_get_dev_path(event->udev), sizeof(filename));