chiark / gitweb /
service: fix check for non-LSB files
authorLennart Poettering <lennart@poettering.net>
Mon, 13 Sep 2010 22:23:15 +0000 (00:23 +0200)
committerLennart Poettering <lennart@poettering.net>
Mon, 13 Sep 2010 22:23:15 +0000 (00:23 +0200)
src/service.c

index c154257..df0d400 100644 (file)
@@ -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);