From: Lennart Poettering Date: Mon, 13 Sep 2010 22:23:15 +0000 (+0200) Subject: service: fix check for non-LSB files X-Git-Tag: v10~8 X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=f21781d57f7e012c1d576dfd8c30b411014c5a88;hp=a2ff477f6775dcff74e32f7d0221b1b11376e84c;p=elogind.git service: fix check for non-LSB files --- diff --git a/src/service.c b/src/service.c index c15425705..df0d40024 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);