From f408fd919a7af5fcd5dac5a505411842b3e8d853 Mon Sep 17 00:00:00 2001 From: Kay Sievers Date: Mon, 24 Nov 2008 02:21:12 +0100 Subject: [PATCH] fix handling of swapping node name with symlink name --- udev/udev-node.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) 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); -- 2.30.2