[systemd-commits] 2 commits - Makefile.am src/service.c units/http-daemon.target

[Lennart Poettering]

 Makefile.am              |    1 +
 src/service.c            |    6 +++---
 units/http-daemon.target |   11 +++++++++++
 3 files changed, 15 insertions(+), 3 deletions(-)

New commits:
commit f21781d57f7e012c1d576dfd8c30b411014c5a88
Author: Lennart Poettering <lennart at poettering.net>
Date:   Tue Sep 14 00:23:15 2010 +0200

    service: fix check for non-LSB files

diff --git a/src/service.c b/src/service.c
index c154257..df0d400 100644
--- a/src/service.c
+++ b/src/service.c
@@ -319,8 +319,8 @@ static int sysv_fix_order(Service *s) {
 
                 /* If both units have modern headers we don't care
                  * about the priorities */
-                if ((!s->sysv_path || s->sysv_has_lsb) &&
-                    (!t->sysv_path || t->sysv_has_lsb))
+                if ((s->meta.fragment_path || s->sysv_has_lsb) &&
+                    (t->meta.fragment_path || t->sysv_has_lsb))
                         continue;
 
                 special_s = s->sysv_runlevels && !chars_intersect(RUNLEVELS_UP, s->sysv_runlevels);
@@ -2280,7 +2280,7 @@ static void service_sigchld_event(Unit *u, pid_t pid, int code, int status) {
         assert(s);
         assert(pid >= 0);
 
-        if (s->sysv_path)
+        if (!s->meta.fragment_path)
                 success = is_clean_exit_lsb(code, status);
         else
                 success = is_clean_exit(code, status);
commit a2ff477f6775dcff74e32f7d0221b1b11376e84c
Author: Lennart Poettering <lennart at poettering.net>
Date:   Tue Sep 14 00:22:47 2010 +0200

    units: add generic description for http-daemon.target

diff --git a/Makefile.am b/Makefile.am
index e1fe9e6..55b6dc8 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -129,6 +129,7 @@ dist_systemunit_DATA = \
 	units/network.target \
 	units/nss-lookup.target \
 	units/mail-transfer-agent.target \
+	units/http-daemon.target \
 	units/poweroff.target \
 	units/reboot.target \
 	units/rescue.target \
diff --git a/units/http-daemon.target b/units/http-daemon.target
new file mode 100644
index 0000000..bd7a1ef
--- /dev/null
+++ b/units/http-daemon.target
@@ -0,0 +1,11 @@
+#  This file is part of systemd.
+#
+#  systemd is free software; you can redistribute it and/or modify it
+#  under the terms of the GNU General Public License as published by
+#  the Free Software Foundation; either version 2 of the License, or
+#  (at your option) any later version.
+
+# See systemd.special(7) for details
+
+[Unit]
+Description=Web Server