[systemd-commits] 2 commits - src/job.c TODO units/fedora

[Lennart Poettering]

 TODO                        |    7 -------
 src/job.c                   |    2 +-
 units/fedora/prefdm.service |    2 +-
 3 files changed, 2 insertions(+), 9 deletions(-)

New commits:
commit a45b9fd09442eb75d39e3419c1fced90c7e339e7
Author: Lennart Poettering <lennart at poettering.net>
Date:   Thu Nov 18 03:52:39 2010 +0100

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

diff --git a/TODO b/TODO
index 6889f83..43077cb 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 79189f0..30a46be 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 ||

commit c1d6bc0e5373cec58821c3cba59a6df8de161e27
Author: Lennart Poettering <lennart at poettering.net>
Date:   Thu Nov 18 02:45:04 2010 +0100

    units: make sure prefdm is killed first, user sessions second on shutdown

diff --git a/TODO b/TODO
index 37833a2..6889f83 100644
--- a/TODO
+++ b/TODO
@@ -2,9 +2,6 @@
   systemd is confused if something goes:
     mounted→unmounting→mounted
 
-* /lib/systemd/systemd-user-sessions stop seems to leave
-  processes behind
-
 * SIGQUIT on shutdown? avahi-daemon[202]: Got SIGQUIT, quitting.
 
 * check if bind mounts work:
diff --git a/units/fedora/prefdm.service b/units/fedora/prefdm.service
index 45ecd7c..e7bd123 100644
--- a/units/fedora/prefdm.service
+++ b/units/fedora/prefdm.service
@@ -7,7 +7,7 @@
 
 [Unit]
 Description=Display Manager
-After=syslog.target livesys-late.service rc-local.service
+After=syslog.target livesys-late.service rc-local.service systemd-user-sessions.service
 
 # On Fedora gdm/X11 is on tty1. We explicitly cancel the getty here to
 # avoid any races around that.