shaba/systemd
1
0
Fork 0
mirror of https://github.com/systemd/systemd.git synced 2025-01-20 18:04:03 +03:00
Code

device: properly handle devices that are referenced before they show up

Browse Source
This commit is contained in:
Lennart Poettering 2010-08-06 04:17:51 +02:00
parent 3c661fadd5
commit ee6cb28869
1 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/device.c
View File

@ -195,7 +195,6 @@ static int device_update_unit(Manager *m, struct udev_device *dev, const char *p
}
if (!u) {
Device *first;
delete = true;
if (!(u = unit_new(m)))
@ -204,13 +203,22 @@ static int device_update_unit(Manager *m, struct udev_device *dev, const char *p
if ((r = device_add_escaped_name(u, path)) < 0)
goto fail;
unit_add_to_load_queue(u);
} else
delete = false;
/* If this was created via some dependency and has not
* actually been seen yet ->sysfs will not be
* initialized. Hence initialize it if necessary. */
if (!DEVICE(u)->sysfs) {
Device *first;
if (!(DEVICE(u)->sysfs = strdup(sysfs))) {
r = -ENOMEM;
goto fail;
}
unit_add_to_load_queue(u);
if (!m->devices_by_sysfs)
if (!(m->devices_by_sysfs = hashmap_new(string_hash_func, string_compare_func))) {
r = -ENOMEM;
@ -222,9 +230,7 @@ static int device_update_unit(Manager *m, struct udev_device *dev, const char *p
if ((r = hashmap_replace(m->devices_by_sysfs, DEVICE(u)->sysfs, first)) < 0)
goto fail;
} else
delete = false;
}
if ((model = udev_device_get_property_value(dev, "ID_MODEL_FROM_DATABASE")) ||
(model = udev_device_get_property_value(dev, "ID_MODEL"))) {