summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2010-11-18 03:52:39 +0100
committerLennart Poettering <lennart@poettering.net>2010-11-18 03:52:39 +0100
commita45b9fd09442eb75d39e3419c1fced90c7e339e7 (patch)
treea9c9308987162ba6db8fa8fd26df3c8aa26fc211
parentc1d6bc0e5373cec58821c3cba59a6df8de161e27 (diff)
job: make sure we don't fail umount.target if a mount unit failed to stop
-rw-r--r--TODO4
-rw-r--r--src/job.c2
2 files changed, 1 insertions, 5 deletions
diff --git a/TODO b/TODO
index 6889f83d62..43077cbb3e 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 79189f04da..30a46bea8b 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 ||