From: Kay Sievers <kay.sievers@vrfy.org>
Date: Thu, 16 Dec 2010 13:29:34 +0000 (+0100)
Subject: service: ifdef distro-specific compat logic
X-Git-Tag: v16~46
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=commitdiff_plain;h=e1992852c8d540f2d9ec3c04a8d9cee791fd8b10;ds=sidebyside

service: ifdef distro-specific compat logic
---

diff --git a/src/service.c b/src/service.c
index 620f2b307..ca0db8e7f 100644
--- a/src/service.c
+++ b/src/service.c
@@ -855,9 +855,10 @@ static int service_load_sysv_name(Service *s, const char *name) {
         assert(s);
         assert(name);
 
-        /* For SysV services we strip the boot. or .sh
+        /* For SysV services we strip the boot.*, rc.* and *.sh
          * prefixes/suffixes. */
         if (startswith(name, "boot.") ||
+            startswith(name, "rc.") ||
             endswith(name, ".sh.service"))
                 return -ENOENT;
 
@@ -873,36 +874,42 @@ static int service_load_sysv_name(Service *s, const char *name) {
 
                 r = service_load_sysv_path(s, path);
 
+#if defined(TARGET_DEBIAN) || defined(TARGET_UBUNTU)
                 if (r >= 0 && s->meta.load_state == UNIT_STUB) {
-                        /* Try Debian style xxx.sh source'able init scripts */
+                        /* Try Debian style *.sh source'able init scripts */
                         strcat(path, ".sh");
                         r = service_load_sysv_path(s, path);
                 }
-
+#endif
                 free(path);
 
+#ifdef TARGET_SUSE
                 if (r >= 0 && s->meta.load_state == UNIT_STUB) {
-                        /* Try SUSE style boot.xxx init scripts */
+                        /* Try SUSE style boot.* init scripts */
 
                         if (asprintf(&path, "%s/boot.%s", *p, name) < 0)
                                 return -ENOMEM;
 
+                        /* Drop .service suffix */
                         path[strlen(path)-8] = 0;
                         r = service_load_sysv_path(s, path);
                         free(path);
                 }
+#endif
 
+#ifdef TARGET_FRUGALWARE
                 if (r >= 0 && s->meta.load_state == UNIT_STUB) {
-                        /* Try Frugalware style rc.xxx init scripts */
+                        /* Try Frugalware style rc.* init scripts */
 
                         if (asprintf(&path, "%s/rc.%s", *p, name) < 0)
                                 return -ENOMEM;
 
-			/* Drop .service suffix */
+                        /* Drop .service suffix */
                         path[strlen(path)-8] = 0;
                         r = service_load_sysv_path(s, path);
                         free(path);
                 }
+#endif
 
                 if (r < 0)
                         return r;