/* read current database entry; cleanup, if it is known device */
udev_old = udev_device_init(NULL);
if (udev_old != NULL) {
+ udev_old->test_run = udev->test_run;
if (udev_db_get_device(udev_old, udev->dev->devpath) == 0) {
info("device '%s' already in database, cleanup", udev->dev->devpath);
udev_db_delete_device(udev_old);
}
}
- /* create node and symlinks */
- retval = udev_node_add(udev, udev_old);
- if (retval == 0)
- udev_db_add_device(udev);
+ /* create node */
+ retval = udev_node_add(udev);
+ if (retval != 0)
+ goto exit;
- /* remove possibly left-over symlinks */
- if (udev_old != NULL) {
- struct name_entry *link_loop;
- struct name_entry *link_old_loop;
- struct name_entry *link_old_tmp_loop;
-
- /* remove still valid symlinks from old list */
- list_for_each_entry_safe(link_old_loop, link_old_tmp_loop, &udev_old->symlink_list, node)
- list_for_each_entry(link_loop, &udev->symlink_list, node)
- if (strcmp(link_old_loop->name, link_loop->name) == 0) {
- dbg("symlink '%s' still valid, keep it", link_old_loop->name);
- list_del(&link_old_loop->node);
- free(link_old_loop);
- }
- udev_node_remove_symlinks(udev_old);
+ /* store in database */
+ udev_db_add_device(udev);
+
+ /* create, replace, delete symlinks according to priority */
+ udev_node_update_symlinks(udev, udev_old);
+
+ if (udev_old != NULL)
udev_device_cleanup(udev_old);
- }
goto exit;
}
/* look if we want to change the name of the netif */
if (strcmp(udev->name, udev->dev->kernel) != 0) {
+ char devpath[PATH_MAX];
char *pos;
retval = rename_netif(udev);
/* export old name */
setenv("INTERFACE_OLD", udev->dev->kernel, 1);
- /* now fake the devpath, because the kernel name changed silently */
- pos = strrchr(udev->dev->devpath, '/');
+ /* now change the devpath, because the kernel device name has changed */
+ strlcpy(devpath, udev->dev->devpath, sizeof(devpath));
+ pos = strrchr(devpath, '/');
if (pos != NULL) {
pos[1] = '\0';
- strlcat(udev->dev->devpath, udev->name, sizeof(udev->dev->devpath));
- strlcpy(udev->dev->kernel, udev->name, sizeof(udev->dev->kernel));
+ strlcat(devpath, udev->name, sizeof(devpath));
+ sysfs_device_set_values(udev->dev, devpath, NULL, NULL);
setenv("DEVPATH", udev->dev->devpath, 1);
setenv("INTERFACE", udev->name, 1);
+ info("changed devpath to '%s'", udev->dev->devpath);
}
}
goto exit;
list_for_each_entry(name_loop, &udev->env_list, node)
putenv(name_loop->name);
} else {
- dbg("'%s' not found in database, using kernel name '%s'", udev->dev->devpath, udev->dev->kernel);
+ dbg("'%s' not found in database, using kernel name '%s'",
+ udev->dev->devpath, udev->dev->kernel);
strlcpy(udev->name, udev->dev->kernel, sizeof(udev->name));
}
goto exit;
}
+ /* remove the node */
retval = udev_node_remove(udev);
+
+ /* delete or restore symlinks according to priority */
+ udev_node_update_symlinks(udev, NULL);
goto exit;
}