SymbX/systemd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ignore device node names while restoring symlinks from the stack

Browse Source
This commit is contained in:
Kay Sievers
2007-09-12 00:21:53 +02:00
parent 554074c9ca
commit 25c208d659
1 changed files with 11 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
udev_node.c
+11 -7
View File
@@ -230,11 +230,15 @@ static int update_link(struct udevice *udev, const char *name)
if (udev_db == NULL)
continue;
if (udev_db_get_device(udev_db, device->name) == 0) {
info("compare priority of '%s' %i > %i",
udev_db->dev->devpath, udev_db->link_priority, priority);
if (target[0] == '\0' || udev_db->link_priority > priority) {
priority = udev_db->link_priority;
strlcpy(target, udev_db->name, sizeof(target));
if (strcmp(udev_db->name, name) == 0) {
info("'%s' is a device node of '%s', skip link update", udev_db->name, device->name);
} else {
info("compare priority of '%s' %i > %i",
udev_db->dev->devpath, udev_db->link_priority, priority);
if (target[0] == '\0' || udev_db->link_priority > priority) {
priority = udev_db->link_priority;
strlcpy(target, udev_db->name, sizeof(target));
}
}
}
udev_device_cleanup(udev_db);
@@ -242,8 +246,8 @@ static int update_link(struct udevice *udev, const char *name)
name_list_cleanup(&name_list);
if (target[0] == '\0') {
err("missing target for '%s'", name);
rc = -1;
info("no current target for '%s' found", name);
rc = 1;
goto out;
}