chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (from parent 1:
3c661fa
)
device: properly handle devices that are referenced before they show up
author
Lennart Poettering
<lennart@poettering.net>
Fri, 6 Aug 2010 02:17:51 +0000
(
04:17
+0200)
committer
Lennart Poettering
<lennart@poettering.net>
Fri, 6 Aug 2010 02:17:51 +0000
(
04:17
+0200)
src/device.c
patch
|
blob
|
history
diff --git
a/src/device.c
b/src/device.c
index 46b3ed3dff8166f447125b63fc22e675f4d77e51..a196a982a02c153582938ac78f3881329d8786b8 100644
(file)
--- a/
src/device.c
+++ b/
src/device.c
@@
-195,7
+195,6
@@
static int device_update_unit(Manager *m, struct udev_device *dev, const char *p
}
if (!u) {
}
if (!u) {
- Device *first;
delete = true;
if (!(u = unit_new(m)))
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;
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;
}
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;
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;
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"))) {
if ((model = udev_device_get_property_value(dev, "ID_MODEL_FROM_DATABASE")) ||
(model = udev_device_get_property_value(dev, "ID_MODEL"))) {