From: Kay Sievers <kay.sievers@vrfy.org>
Date: Tue, 28 Apr 2009 13:59:45 +0000 (+0200)
Subject: accept DEVNAME from the kernel as a hint for the node name
X-Git-Tag: 174~1065
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=commitdiff_plain;h=8e4bd225584b63478de106d7b306ba6707c8b2b4

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 f4d712179..b7cdbf340 100644
--- 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));