X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=udev%2Fudev-node.c;h=100ca92903ef2baf41ff36b6a5f2326176221325;hp=1a189c5aae7c078371f9d9c9be429f45085d84d8;hb=18cff5c3b2e3591fa46107288ea2d7026a15ccf3;hpb=6e0cb78c9d59f976222ecd88c172b4cd9a5b7347 diff --git a/udev/udev-node.c b/udev/udev-node.c index 1a189c5aa..100ca9290 100644 --- a/udev/udev-node.c +++ b/udev/udev-node.c @@ -371,18 +371,23 @@ void udev_node_update_old_links(struct udev_device *dev, struct udev_device *dev struct udev_list_entry *list_entry_current; int found; + /* check if old link name is now our node name */ + if (strcmp(name, udev_device_get_devnode(dev)) == 0) + continue; + + /* check if old link name still belongs to this device */ found = 0; udev_list_entry_foreach(list_entry_current, udev_device_get_devlinks_list_entry(dev)) { const char *name_current = udev_list_entry_get_name(list_entry_current); - if (strcmp(name_current, name) == 0) { + if (strcmp(name, name_current) == 0) { found = 1; break; } } if (found) continue; - /* link does no longer belong to this device */ + info(udev, "update old symlink '%s' no longer belonging to '%s'\n", name, udev_device_get_devpath(dev)); name_index(udev, udev_device_get_devpath(dev), name, 0, test); update_link(dev, name, test);