X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=src%2Fcore%2Fdevice.c;h=72d98aea722cadaf0e18d669d556f78bae5e1b12;hp=19fc7451d8b7108d8e069f74cadeca84e4f40896;hb=556089dc57b10a12a03edd3d3e90ca17398ad206;hpb=e775289d56ace2f8d23e62ed79316d71332d6d05 diff --git a/src/core/device.c b/src/core/device.c index 19fc7451d..72d98aea7 100644 --- a/src/core/device.c +++ b/src/core/device.c @@ -264,7 +264,6 @@ static int device_update_unit(Manager *m, struct udev_device *dev, const char *p FOREACH_WORD_QUOTED(w, l, wants, state) { _cleanup_free_ char *n = NULL; char e[l+1]; - Unit *other; memcpy(e, w, l); e[l] = 0; @@ -278,15 +277,6 @@ static int device_update_unit(Manager *m, struct udev_device *dev, const char *p r = unit_add_dependency_by_name(u, UNIT_WANTS, n, NULL, true); if (r < 0) goto fail; - - other = manager_get_unit(u->manager, n); - if (!other || !unit_can_start(other)) - continue; - - r = manager_add_job(u->manager, JOB_START, other, JOB_REPLACE, true, NULL, NULL); - if (r < 0) - log_warning("Failed to add job %s/%s, ignoring: %s.", - other->id, job_type_to_string(JOB_START), strerror(-r)); } } } @@ -559,6 +549,10 @@ static int device_enumerate(Manager *m) { if (r < 0) goto fail; + r = udev_enumerate_add_match_is_initialized(e); + if (r < 0) + goto fail; + r = udev_enumerate_scan_devices(e); if (r < 0) goto fail;