[systemd-commits] 3 commits - TODO src/core units/systemd-sysctl.service.in

[Lennart Poettering]

 TODO                            |    4 ++++
 src/core/unit.c                 |    5 -----
 units/systemd-sysctl.service.in |    1 +
 3 files changed, 5 insertions(+), 5 deletions(-)

New commits:
commit 64e30145fce09b87a0b0a7e08c84a100818a5d5a
Author: Lennart Poettering <lennart at poettering.net>
Date:   Sat Mar 23 03:19:50 2013 +0100

    update TODO

diff --git a/TODO b/TODO
index d481238..bdceeff 100644
--- a/TODO
+++ b/TODO
@@ -44,6 +44,10 @@ Fedora 19:
 
 Features:
 
+* matching against units is currently broken in journalctl. We really
+  need another AND level in the expressions,
+  i.e. sd_journal_add_conjunction().
+
 * add ConditionArchitecture= or so
 
 * teach ConditionKernelCommandLine= globs or regexes (in order to match foobar={no,0,off})

commit 335b5240ae584ed184afc683519bf19d6e1e1145
Author: Lennart Poettering <lennart at poettering.net>
Date:   Sat Mar 23 03:16:17 2013 +0100

    unit: never retroactively start requisites
    
    Requesites are not supposed to be auto-started afterall, they are just
    checks, so don't try to be smarter here than appropriate.
    
    Based on a patch from Michal Schmidt.

diff --git a/src/core/unit.c b/src/core/unit.c
index d43558e..7111679 100644
--- a/src/core/unit.c
+++ b/src/core/unit.c
@@ -1241,11 +1241,6 @@ static void retroactively_start_dependencies(Unit *u) {
                     !UNIT_IS_ACTIVE_OR_ACTIVATING(unit_active_state(other)))
                         manager_add_job(u->manager, JOB_START, other, JOB_FAIL, false, NULL, NULL);
 
-        SET_FOREACH(other, u->dependencies[UNIT_REQUISITE], i)
-                if (!set_get(u->dependencies[UNIT_AFTER], other) &&
-                    !UNIT_IS_ACTIVE_OR_ACTIVATING(unit_active_state(other)))
-                        manager_add_job(u->manager, JOB_START, other, JOB_REPLACE, true, NULL, NULL);
-
         SET_FOREACH(other, u->dependencies[UNIT_WANTS], i)
                 if (!set_get(u->dependencies[UNIT_AFTER], other) &&
                     !UNIT_IS_ACTIVE_OR_ACTIVATING(unit_active_state(other)))

commit 0debd2bf2f92d4e8f7a3e520c6c1d522e5058929
Author: Lennart Poettering <lennart at poettering.net>
Date:   Sat Mar 23 03:10:41 2013 +0100

    Revert "units: ignore systemd-sysctl on shutdown"
    
    This reverts commit faeffa73a81ab5b59acfadeb571431fb0e42af70.
    
    There isn't really much point in dropping the Conflicts= since shutting
    down this service is basically free as it doesn't have anything running.
    
    Also, the patch was incomplete, because shutdown.target was still listed
    in Before=.

diff --git a/units/systemd-sysctl.service.in b/units/systemd-sysctl.service.in
index d914553..45e1ceb 100644
--- a/units/systemd-sysctl.service.in
+++ b/units/systemd-sysctl.service.in
@@ -9,6 +9,7 @@
 Description=Apply Kernel Variables
 Documentation=man:systemd-sysctl.service(8) man:sysctl.d(5)
 DefaultDependencies=no
+Conflicts=shutdown.target
 After=systemd-readahead-collect.service systemd-readahead-replay.service
 Before=sysinit.target shutdown.target
 ConditionPathIsReadWrite=/proc/sys/