[systemd-commits] 2 commits - src/service.c units/systemd-readahead-collect.service.in units/systemd-readahead-replay.service.in

[Lennart Poettering]

 src/service.c                              |    4 ++--
 units/systemd-readahead-collect.service.in |    1 +
 units/systemd-readahead-replay.service.in  |    1 +
 3 files changed, 4 insertions(+), 2 deletions(-)

New commits:
commit a966a504e8d3a1c7c5a288b1d7884847be224192
Author: Lennart Poettering <lennart at poettering.net>
Date:   Fri Sep 23 17:42:54 2011 +0200

    readahead: opt out of bridge logging for readahead in order not to delay things unnecessarily

diff --git a/units/systemd-readahead-collect.service.in b/units/systemd-readahead-collect.service.in
index 1a66f9f..56ba54f 100644
--- a/units/systemd-readahead-collect.service.in
+++ b/units/systemd-readahead-collect.service.in
@@ -16,6 +16,7 @@ Before=sysinit.target shutdown.target
 Type=notify
 ExecStart=@rootlibexecdir@/systemd-readahead-collect
 RemainAfterExit=yes
+StandardOutput=null
 
 [Install]
 WantedBy=default.target
diff --git a/units/systemd-readahead-replay.service.in b/units/systemd-readahead-replay.service.in
index 5cc6def..7c82e40 100644
--- a/units/systemd-readahead-replay.service.in
+++ b/units/systemd-readahead-replay.service.in
@@ -16,6 +16,7 @@ ConditionPathExists=/.readahead
 Type=notify
 ExecStart=@rootlibexecdir@/systemd-readahead-replay
 RemainAfterExit=yes
+StandardOutput=null
 
 [Install]
 WantedBy=default.target

commit 4e2b0f9b149e6fc1adb5ce49a6adaeed130577be
Author: Lennart Poettering <lennart at poettering.net>
Date:   Fri Sep 23 17:42:21 2011 +0200

    service: fix up std output/error before we add dependencies to the bridge socket

diff --git a/src/service.c b/src/service.c
index 2ae8785..c2053ce 100644
--- a/src/service.c
+++ b/src/service.c
@@ -1145,6 +1145,8 @@ static int service_load(Unit *u) {
 
         /* This is a new unit? Then let's add in some extras */
         if (u->meta.load_state == UNIT_LOADED) {
+                service_fix_output(s);
+
                 if ((r = unit_add_exec_dependencies(u, &s->exec_context)) < 0)
                         return r;
 
@@ -1173,8 +1175,6 @@ static int service_load(Unit *u) {
                 if (s->meta.default_dependencies)
                         if ((r = service_add_default_dependencies(s)) < 0)
                                 return r;
-
-                service_fix_output(s);
         }
 
         return service_verify(s);