#include "udev.h"
#include "udev_version.h"
#include "namedev.h"
+#include "udevdb.h"
#include "libsysfs/libsysfs.h"
/*
- * Here would go a call to the naming deamon, to get the name we want to have
- * for this device. But for now, let's just default to whatever the kernel is
- * calling the device as that will keep the "old-style" naming policy
+ * Look up the sysfs path in the database to see if we have named this device
+ * something different from the kernel name. If we have, us it. If not, use
+ * the default kernel name for lack of anything else to know to do.
*/
-static char *get_name(char *dev, int major, int minor)
+static char *get_name(char *path, int major, int minor)
{
static char name[100];
+ struct udevice *dev;
char *temp;
- temp = strrchr(dev, '/');
+ dev = udevdb_get_dev(path);
+ if (dev != NULL) {
+ strcpy(name, dev->name);
+ goto exit;
+ }
+
+ dbg("%s not found in database, falling back on default name", path);
+ temp = strrchr(path, '/');
if (temp == NULL)
return NULL;
strncpy(name, &temp[1], sizeof(name));
+exit:
dbg("name is %s", name);
-
return &name[0];
}
{
char filename[255];
- strncpy(filename, UDEV_ROOT, sizeof(filename));
+ strncpy(filename, udev_root, sizeof(filename));
strncat(filename, name, sizeof(filename));
dbg("unlinking %s", filename);
goto exit;
}
+ udevdb_delete_dev(device);
+
return delete_node(name);
exit:
return retval;
}
-