dm0 / rpms / systemd

Forked from rpms/systemd 5 years ago
Clone
a1c89c5
From 4e2b0f9b149e6fc1adb5ce49a6adaeed130577be Mon Sep 17 00:00:00 2001
a1c89c5
From: Lennart Poettering <lennart@poettering.net>
a1c89c5
Date: Fri, 23 Sep 2011 17:42:21 +0200
a1c89c5
Subject: [PATCH] service: fix up std output/error before we add dependencies
a1c89c5
 to the bridge socket
a1c89c5
a1c89c5
---
a1c89c5
 src/service.c |    4 ++--
a1c89c5
 1 files changed, 2 insertions(+), 2 deletions(-)
a1c89c5
a1c89c5
diff --git a/src/service.c b/src/service.c
a1c89c5
index 2ae8785..c2053ce 100644
a1c89c5
--- a/src/service.c
a1c89c5
+++ b/src/service.c
a1c89c5
@@ -1145,6 +1145,8 @@ static int service_load(Unit *u) {
a1c89c5
 
a1c89c5
         /* This is a new unit? Then let's add in some extras */
a1c89c5
         if (u->meta.load_state == UNIT_LOADED) {
a1c89c5
+                service_fix_output(s);
a1c89c5
+
a1c89c5
                 if ((r = unit_add_exec_dependencies(u, &s->exec_context)) < 0)
a1c89c5
                         return r;
a1c89c5
 
a1c89c5
@@ -1173,8 +1175,6 @@ static int service_load(Unit *u) {
a1c89c5
                 if (s->meta.default_dependencies)
a1c89c5
                         if ((r = service_add_default_dependencies(s)) < 0)
a1c89c5
                                 return r;
a1c89c5
-
a1c89c5
-                service_fix_output(s);
a1c89c5
         }
a1c89c5
 
a1c89c5
         return service_verify(s);
a1c89c5
-- 
a1c89c5
1.7.4.4
a1c89c5