From a45b9fd09442eb75d39e3419c1fced90c7e339e7 Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Thu, 18 Nov 2010 03:52:39 +0100 Subject: [PATCH] job: make sure we don't fail umount.target if a mount unit failed to stop --- TODO | 4 ---- src/job.c | 2 +- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/TODO b/TODO index 6889f83d..43077cbb 100644 --- a/TODO +++ b/TODO @@ -1,7 +1,3 @@ -* leaving file open on mounted non-root filesystems breaks shutdown - systemd is confused if something goes: - mounted→unmounting→mounted - * SIGQUIT on shutdown? avahi-daemon[202]: Got SIGQUIT, quitting. * check if bind mounts work: diff --git a/src/job.c b/src/job.c index 79189f04..30a46bea 100644 --- a/src/job.c +++ b/src/job.c @@ -531,7 +531,7 @@ int job_finish_and_invalidate(Job *j, bool success) { } else if (t == JOB_STOP) { - SET_FOREACH(other, u->meta.dependencies[UNIT_CONFLICTS], i) + SET_FOREACH(other, u->meta.dependencies[UNIT_CONFLICTED_BY], i) if (other->meta.job && (other->meta.job->type == JOB_START || other->meta.job->type == JOB_VERIFY_ACTIVE || -- 2.39.5