[PATCH] udev spec file bits

[elogind.git] / udev-add.c

diff --git a/udev-add.c b/udev-add.c
index 586815e2c794386b0c720528f3d94b6a92b775b6..116ab2b448cb9f0d92edcf35437e19e137992198 100644 (file)
--- 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'",
@@ -161,10 +163,16 @@ int udev_add_device(char *device, char *subsystem)
 
        retval = get_major_minor(class_dev, &major, &minor);
        if (retval) {
-               dbg ("get_major_minor failed");
+               dbg("get_major_minor failed");
                goto exit;
        }
 
+       retval = udevdb_add_device(device, class_dev, attr.name, type, major, minor, attr.mode);
+
+       if (retval != 0)
+               dbg("udevdb_add_device failed, but we are going to try to create the node anyway. "
+                   "But remove might not work properly for this device.");
+
        sysfs_close_class_device(class_dev);
 
        return create_node(attr.name, type, major, minor, attr.mode);