From: Lennart Poettering <lennart@poettering.net>
Date: Tue, 23 Feb 2016 19:38:53 +0000 (+0100)
Subject: core: drop SysV paths from path-lookup logic
X-Git-Tag: v230~185^2~67
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=1dfa3076cfbb00c48a26892b72148265ea3b69f3;p=thirdparty%2Fsystemd.git

core: drop SysV paths from path-lookup logic

We don't need it anymore, give that sysv-generator can determine the path on
its own now.
---

diff --git a/src/shared/path-lookup.c b/src/shared/path-lookup.c
index 54106207253..ac22a27ccbd 100644
--- a/src/shared/path-lookup.c
+++ b/src/shared/path-lookup.c
@@ -338,77 +338,6 @@ int lookup_paths_init(
                 p->unit_path = strv_free(p->unit_path);
         }
 
-        if (running_as == MANAGER_SYSTEM) {
-#ifdef HAVE_SYSV_COMPAT
-                /* /etc/init.d/ compatibility does not matter to users */
-
-                e = getenv("SYSTEMD_SYSVINIT_PATH");
-                if (e) {
-                        r = path_split_and_make_absolute(e, &p->sysvinit_path);
-                        if (r < 0)
-                                return r;
-                } else
-                        p->sysvinit_path = NULL;
-
-                if (strv_isempty(p->sysvinit_path)) {
-                        strv_free(p->sysvinit_path);
-
-                        p->sysvinit_path = strv_new(
-                                        SYSTEM_SYSVINIT_PATH,     /* /etc/init.d/ */
-                                        NULL);
-                        if (!p->sysvinit_path)
-                                return -ENOMEM;
-                }
-
-                e = getenv("SYSTEMD_SYSVRCND_PATH");
-                if (e) {
-                        r = path_split_and_make_absolute(e, &p->sysvrcnd_path);
-                        if (r < 0)
-                                return r;
-                } else
-                        p->sysvrcnd_path = NULL;
-
-                if (strv_isempty(p->sysvrcnd_path)) {
-                        strv_free(p->sysvrcnd_path);
-
-                        p->sysvrcnd_path = strv_new(
-                                        SYSTEM_SYSVRCND_PATH,     /* /etc/rcN.d/ */
-                                        NULL);
-                        if (!p->sysvrcnd_path)
-                                return -ENOMEM;
-                }
-
-                if (!path_strv_resolve_uniq(p->sysvinit_path, root_dir))
-                        return -ENOMEM;
-
-                if (!path_strv_resolve_uniq(p->sysvrcnd_path, root_dir))
-                        return -ENOMEM;
-
-                if (!strv_isempty(p->sysvinit_path)) {
-                        _cleanup_free_ char *t = strv_join(p->sysvinit_path, "\n\t");
-                        if (!t)
-                                return -ENOMEM;
-                        log_debug("Looking for SysV init scripts in:\n\t%s", t);
-                } else {
-                        log_debug("Ignoring SysV init scripts.");
-                        p->sysvinit_path = strv_free(p->sysvinit_path);
-                }
-
-                if (!strv_isempty(p->sysvrcnd_path)) {
-                        _cleanup_free_ char *t =
-                                strv_join(p->sysvrcnd_path, "\n\t");
-                        if (!t)
-                                return -ENOMEM;
-
-                        log_debug("Looking for SysV rcN.d links in:\n\t%s", t);
-                } else {
-                        log_debug("Ignoring SysV rcN.d links.");
-                        p->sysvrcnd_path = strv_free(p->sysvrcnd_path);
-                }
-#else
-                log_debug("SysV init scripts and rcN.d links support disabled");
-#endif
-        }
 
         return 0;
 }
@@ -417,11 +346,6 @@ void lookup_paths_free(LookupPaths *p) {
         assert(p);
 
         p->unit_path = strv_free(p->unit_path);
-
-#ifdef HAVE_SYSV_COMPAT
-        p->sysvinit_path = strv_free(p->sysvinit_path);
-        p->sysvrcnd_path = strv_free(p->sysvrcnd_path);
-#endif
 }
 
 int lookup_paths_init_from_scope(LookupPaths *paths,
diff --git a/src/shared/path-lookup.h b/src/shared/path-lookup.h
index 26c83d61111..c53d2930720 100644
--- a/src/shared/path-lookup.h
+++ b/src/shared/path-lookup.h
@@ -24,10 +24,6 @@
 
 typedef struct LookupPaths {
         char **unit_path;
-#ifdef HAVE_SYSV_COMPAT
-        char **sysvinit_path;
-        char **sysvrcnd_path;
-#endif
 } LookupPaths;
 
 typedef enum ManagerRunningAs {