X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=udev-add.c;h=48979393a5c2776a4340c5cb7703c95013996574;hb=04db8c9e06986f0406f4f7cd9a2245e35dd5db9f;hp=586815e2c794386b0c720528f3d94b6a92b775b6;hpb=63dde9f8eb9a204771be7cc3219d53ee7a0d5ffb;p=elogind.git

diff --git a/udev-add.c b/udev-add.c
index 586815e2c..48979393a 100644
--- a/udev-add.c
+++ b/udev-add.c
@@ -31,6 +31,7 @@
 #include "udev.h"
 #include "udev_version.h"
 #include "namedev.h"
+#include "udevdb.h"
 #include "libsysfs/libsysfs.h"
 
 
@@ -92,6 +93,7 @@ static int create_node(char *name, char type, int major, int minor, int mode)
 		return -EINVAL;
 	}
 
+	dbg("mknod(%s, %#o, %u, %u)", filename, mode, major, minor);
 	retval = mknod(filename,mode,makedev(major,minor));
 	if (retval)
 		dbg("mknod(%s, %#o, %u, %u) failed with error '%s'",
@@ -135,6 +137,7 @@ int udev_add_device(char *device, char *subsystem)
 {
 	struct sysfs_class_device *class_dev;
 	struct device_attr attr;
+	struct udevice dbdev;
 	int major;
 	int minor;
 	char type;
@@ -164,9 +167,31 @@ int udev_add_device(char *device, char *subsystem)
 		dbg ("get_major_minor failed");
 		goto exit;
 	}
+	memset(&dbdev, 0, sizeof(dbdev));
+	strncpy(dbdev.name, attr.name, NAME_SIZE);
+	strncpy(dbdev.sysfs_path, class_dev->sysdevice->directory->path,
+		PATH_SIZE);
+	strncpy(dbdev.class_dev_name, class_dev->name, NAME_SIZE);
+	if ((sysfs_get_name_from_path(subsystem, dbdev.class_name, NAME_SIZE))
+	    != 0)
+		strcpy(dbdev.class_name, "unkown");
+	strncpy(dbdev.bus_id, class_dev->sysdevice->bus_id, ID_SIZE);
+	strcpy(dbdev.bus_name, "unknown");
+	if (class_dev->driver != NULL)
+		strncpy(dbdev.driver, class_dev->driver->name, NAME_SIZE);
+	else
+		strcpy(dbdev.driver, "unkown");
+	dbdev.type = type;
+	dbdev.major = major;
+	dbdev.minor = minor;
+	dbdev.mode = attr.mode;
 
 	sysfs_close_class_device(class_dev);
 
+	retval = udevdb_add_udevice(&dbdev);
+	if (retval != 0)
+		goto exit;
+
 	return create_node(attr.name, type, major, minor, attr.mode);
 
 exit: