job: make sure we don't fail umount.target if a mount unit failed to stop

diff --git a/TODO b/TODO
index 6889f83d6289fe9c52b889f7e69a9b8f539a479e..43077cbb3e1df1289cefb172c3d61d802c4756b0 100644 (file)
--- 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 79189f04da101db1ed8188ea95601c6e1c64f8cd..30a46bea8bfea54e112e64c7008b58ee425b475d 100644 (file)
--- 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 ||