count = udev_db_get_devices_by_name(name, &name_list);
info("found %i devices with name '%s'", count, name);
- /* if we don't have any reference, we can delete the link */
+ /* if we don't have a reference, delete it */
if (count <= 0) {
info("no reference left, remove '%s'", name);
if (!udev->test_run) {
if (udev_old != NULL) {
struct name_entry *link_loop;
struct name_entry *link_old_loop;
- struct name_entry *link_old_tmp_loop;
int found;
/* remove current 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_old_loop, &udev_old->symlink_list, node) {
found = 0;
list_for_each_entry(link_loop, &udev->symlink_list, node) {
if (strcmp(link_old_loop->name, link_loop->name) == 0) {
}
}
- /* the old node is gone, maybe we have a device with a symlink now */
- update_link(udev, udev_old->name);
+ /*
+ * if the node name has changed, delete the node,
+ * or possibly restore a symlink of another device
+ */
+ if (strcmp(udev->name, udev_old->name) != 0)
+ update_link(udev, udev_old->name);
}
}
char filename[PATH_SIZE];
char partitionname[PATH_SIZE];
struct stat stats;
- int retval;
+ int retval = 0;
int num;
strlcpy(filename, udev_root, sizeof(filename));
}
info("removing device node '%s'", filename);
- retval = unlink_secure(filename);
+ if (!udev->test_run)
+ retval = unlink_secure(filename);
if (retval)
return retval;
for (i = 1; i <= num; i++) {
snprintf(partitionname, sizeof(partitionname), "%s%d", filename, i);
partitionname[sizeof(partitionname)-1] = '\0';
- unlink_secure(partitionname);
+ if (!udev->test_run)
+ unlink_secure(partitionname);
}
}
delete_path(filename);