minor(udev_device_get_devnum(dev)));
if (event->tmp_node == NULL)
break;
- udev_node_mknod(dev, event->tmp_node, makedev(0, 0), 0600, 0, 0);
+ udev_node_mknod(dev, event->tmp_node, 0600, 0, 0);
l = util_strpcpy(&s, l, event->tmp_node);
break;
}
if (strcmp(udev_device_get_action(dev), "remove") == 0) {
udev_device_read_db(dev);
- udev_device_set_info_loaded(dev);
udev_device_delete_db(dev);
+ udev_device_tag_index(dev, NULL, false);
if (major(udev_device_get_devnum(dev)) != 0)
udev_watch_end(event->udev, dev);
/* delete stale db file */
udev_device_delete_db(dev);
+ udev_device_tag_index(dev, NULL, false);
/* remember old name */
udev_device_add_property(dev, "INTERFACE_OLD", udev_device_get_sysname(dev));
}
}
- if (event->name == NULL) {
- /* things went wrong */
+ if (event->name == NULL || event->name[0] == '\0') {
udev_device_delete_db(dev);
+ udev_device_tag_index(dev, NULL, false);
udev_device_unref(event->dev_db);
err = -ENOMEM;
+ err(event->udev, "no node name, something went wrong, ignoring\n");
goto out;
}
+ if (udev_device_get_knodename(dev) != NULL && strcmp(udev_device_get_knodename(dev), event->name) != 0)
+ err(event->udev, "kernel-provided name '%s' and NAME= '%s' disagree, "
+ "please use SYMLINK+= or change the kernel to provide the proper name\n",
+ udev_device_get_knodename(dev), event->name);
+
/* set device node name */
util_strscpyl(filename, sizeof(filename), udev_get_dev_path(event->udev), "/", event->name, NULL);
udev_device_set_devnode(dev, filename);
}
udev_device_update_db(dev);
+ udev_device_tag_index(dev, event->dev_db, true);
if (major(udev_device_get_devnum(dev)) != 0) {
/* remove/update possible left-over symlinks from old database entry */
if (event->dev_db != NULL)
udev_node_update_old_links(dev, event->dev_db);
- if (event->name[0] != '\0')
- err = udev_node_add(dev, event->mode, event->uid, event->gid);
- else
- info(event->udev, "device node creation suppressed\n");
-
- /* remove kernel-created node, if needed */
- if (udev_device_get_knodename(dev) != NULL && strcmp(event->name, udev_device_get_knodename(dev)) != 0) {
- struct stat stats;
- char filename[UTIL_PATH_SIZE];
-
- util_strscpyl(filename, sizeof(filename), udev_get_dev_path(event->udev), "/", udev_device_get_knodename(dev), NULL);
- if (lstat(filename, &stats) == 0 && stats.st_rdev == udev_device_get_devnum(dev)) {
- info(event->udev, "remove kernel created node '%s'\n", udev_device_get_knodename(dev));
- util_unlink_secure(event->udev, filename);
- util_delete_path(event->udev, filename);
- }
- }
+ err = udev_node_add(dev, event->mode, event->uid, event->gid);
}
udev_device_unref(event->dev_db);