From: Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
Date: Sat, 5 Jan 2013 02:18:17 +0000 (-0500)
Subject: service: fixup after ifdef dropping
X-Git-Tag: v197~45
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=commitdiff_plain;h=a83ad683fd13e27b3c4e582ecd6c3852245dbe2f

service: fixup after ifdef dropping

Commit 88516c0 removed one line too much.
---

diff --git a/src/core/service.c b/src/core/service.c
index a4e419b79..70b93e844 100644
--- a/src/core/service.c
+++ b/src/core/service.c
@@ -977,9 +977,9 @@ static int service_load_sysv_name(Service *s, const char *name) {
 
         /* For SysV services we strip the rc.* and *.sh
          * prefixes/suffixes. */
-        if (endswith(name, ".sh.service"))
+        if (startswith(name, "rc.") ||
+            endswith(name, ".sh.service"))
                 return -ENOENT;
-        if (startswith(name, "rc."))
 
         STRV_FOREACH(p, UNIT(s)->manager->lookup_paths.sysvinit_path) {
                 char *path;