shaba/systemd
1
0
Fork 0
mirror of https://github.com/systemd/systemd.git synced 2025-03-23 10:50:16 +03:00
Code

core: drop SysV paths from path-lookup logic

Browse Source 
We don't need it anymore, give that sysv-generator can determine the path on
its own now.
This commit is contained in:
Lennart Poettering 2016-02-23 20:38:53 +01:00
parent 4143c6c305
commit 1dfa3076cf
2 changed files with 0 additions and 80 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

76
src/shared/path-lookup.c
View File

@ -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,

4
src/shared/path-lookup.h
View File

@ -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 {