[systemd-commits] 2 commits - man/systemd.service.xml src/execute.c

[Michal Schmidt]

 man/systemd.service.xml |    4 ++--
 src/execute.c           |    3 +--
 2 files changed, 3 insertions(+), 4 deletions(-)

New commits:
commit 0b1f4ae63548c627decd80e3e2fd030c2d4f3af6
Author: Michal Schmidt <mschmidt at redhat.com>
Date:   Sat Dec 17 01:33:40 2011 +0100

    execute: fix losing of start timestamps
    
    Start timestamps were always cleared before saving exit timestamps.
    Fix it by removing a condition that makes no sense any way I look at it.

diff --git a/src/execute.c b/src/execute.c
index 481725d..abbbfdd 100644
--- a/src/execute.c
+++ b/src/execute.c
@@ -1860,8 +1860,7 @@ void exec_status_start(ExecStatus *s, pid_t pid) {
 void exec_status_exit(ExecStatus *s, ExecContext *context, pid_t pid, int code, int status) {
         assert(s);
 
-        if ((s->pid && s->pid != pid) ||
-            !s->start_timestamp.realtime <= 0)
+        if (s->pid && s->pid != pid)
                 zero(*s);
 
         s->pid = pid;

commit 4f025f4c4f9e043a06a05bcd4fc9fa65ee232ecc
Author: Michal Schmidt <mschmidt at redhat.com>
Date:   Sat Dec 17 00:39:19 2011 +0100

    man: fix misplaced remark in description of Sockets=

diff --git a/man/systemd.service.xml b/man/systemd.service.xml
index 7b6f12d..0baddd1 100644
--- a/man/systemd.service.xml
+++ b/man/systemd.service.xml
@@ -671,11 +671,11 @@
                                 <listitem><para>Specifies the name of
                                 the socket units this service shall
                                 inherit the sockets from when the
-                                service (ignoring the different suffix
-                                of course) is started. Normally it
+                                service is started. Normally it
                                 should not be necessary to use this
                                 setting as all sockets whose unit
                                 shares the same name as the service
+                                (ignoring the different suffix of course)
                                 are passed to the spawned
                                 process.</para>