X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;ds=sidebyside;f=dev_d.c;h=483ceb4b1b983f398831a46d8db41aa48f88bd18;hb=d5853b48fb098ca63af813ae74cd6af3a9400d01;hp=9bb9507b9b3d95701cb456c51964e61a4cdea6ab;hpb=4a539daf1e5daa17b52239478d97f8dc7a6506b6;p=elogind.git

diff --git a/dev_d.c b/dev_d.c
index 9bb9507b9..483ceb4b1 100644
--- a/dev_d.c
+++ b/dev_d.c
@@ -61,14 +61,23 @@ static int run_program(char *name)
  * 	subsystem/
  * 	default/
  */
-void dev_d_send(struct udevice *dev, char *subsystem)
+void dev_d_send(struct udevice *dev, char *subsystem, char *devpath)
 {
 	char dirname[256];
-	char devnode[NAME_SIZE];
+	char devname[NAME_SIZE];
 
-	strfieldcpy(devnode, udev_root);
-	strfieldcat(devnode, dev->name);
-	setenv("DEVNODE", devnode, 1);
+	if (udev_dev_d == 0)
+		return;
+
+	if (dev->type == 'b' || dev->type == 'c') {
+		strfieldcpy(devname, udev_root);
+		strfieldcat(devname, dev->name);
+	} else if (dev->type == 'n') {
+		strfieldcpy(devname, dev->name);
+		setenv("DEVPATH", devpath, 1);
+	}
+	setenv("DEVNAME", devname, 1);
+	dbg("DEVNAME='%s'", devname);
 
 	strcpy(dirname, DEVD_DIR);
 	strfieldcat(dirname, dev->name);
@@ -81,4 +90,3 @@ void dev_d_send(struct udevice *dev, char *subsystem)
 	strcpy(dirname, DEVD_DIR "default");
 	call_foreach_file(run_program, dirname, DEVD_SUFFIX);
 }
-