chiark / gitweb /
Revert "systemd: add a start job for all units in SYSTEMD_[USER_]WANTS="
authorLennart Poettering <lennart@poettering.net>
Tue, 10 Dec 2013 18:53:08 +0000 (18:53 +0000)
committerLennart Poettering <lennart@poettering.net>
Tue, 10 Dec 2013 18:53:56 +0000 (18:53 +0000)
This reverts commit e775289d56ace2f8d23e62ed79316d71332d6d05.

We really should let the dependency logic add jobs for dependencies here
rather than manually adding in jobs, overtaping the real problem.

src/core/device.c

index 19fc7451d8b7108d8e069f74cadeca84e4f40896..4ff7c37238a566b641e0ae87bb9f300dc6a156f7 100644 (file)
@@ -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));
                         }
                 }
         }