device: look for all possible device names on udev events

[elogind.git] / job.c

diff --git a/job.c b/job.c
index c4d2e7a11e5c7a531a5e086abd9985568725a2c7..5e250d58f0ca0b9caca6c1aaaf7b3de8c07394ec 100644 (file)
--- a/job.c
+++ b/job.c
@@ -65,7 +65,7 @@ void job_free(Job *j) {
         }
 
         /* Detach from next 'smaller' objects */
-        manager_transaction_unlink_job(j->manager, j);
+        manager_transaction_unlink_job(j->manager, j, true);
 
         if (j->in_run_queue)
                 LIST_REMOVE(Job, run_queue, j->manager->run_queue, j);
@@ -485,26 +485,26 @@ int job_finish_and_invalidate(Job *j, bool success) {
 
                         SET_FOREACH(other, u->meta.dependencies[UNIT_REQUIRED_BY], i)
                                 if (other->meta.job &&
-                                    (other->meta.type == JOB_START ||
-                                     other->meta.type == JOB_VERIFY_ACTIVE ||
-                                     other->meta.type == JOB_RELOAD_OR_START))
+                                    (other->meta.job->type == JOB_START ||
+                                     other->meta.job->type == JOB_VERIFY_ACTIVE ||
+                                     other->meta.job->type == JOB_RELOAD_OR_START))
                                         job_finish_and_invalidate(other->meta.job, false);
 
                         SET_FOREACH(other, u->meta.dependencies[UNIT_SOFT_REQUIRED_BY], i)
                                 if (other->meta.job &&
                                     !other->meta.job->forced &&
-                                    (other->meta.type == JOB_START ||
-                                     other->meta.type == JOB_VERIFY_ACTIVE ||
-                                     other->meta.type == JOB_RELOAD_OR_START))
+                                    (other->meta.job->type == JOB_START ||
+                                     other->meta.job->type == JOB_VERIFY_ACTIVE ||
+                                     other->meta.job->type == JOB_RELOAD_OR_START))
                                         job_finish_and_invalidate(other->meta.job, false);
 
                 } else if (t == JOB_STOP) {
 
                         SET_FOREACH(other, u->meta.dependencies[UNIT_CONFLICTS], i)
                                 if (other->meta.job &&
-                                    (t == JOB_START ||
-                                     t == JOB_VERIFY_ACTIVE ||
-                                     t == JOB_RELOAD_OR_START))
+                                    (other->meta.job->type == JOB_START ||
+                                     other->meta.job->type == JOB_VERIFY_ACTIVE ||
+                                     other->meta.job->type == JOB_RELOAD_OR_START))
                                         job_finish_and_invalidate(other->meta.job, false);
                 }
         }