chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
manager: split off path lookup logic into own .c file
[elogind.git]
/
src
/
service.c
diff --git
a/src/service.c
b/src/service.c
index e1975eb119112c4e7c7d8b9adc72201714969454..82a18a4311722aad1faf8306899e695c70e63682 100644
(file)
--- a/
src/service.c
+++ b/
src/service.c
@@
-675,7
+675,7
@@
static int service_load_sysv_name(Service *s, const char *name) {
endswith(name, ".sh.service"))
return -ENOENT;
endswith(name, ".sh.service"))
return -ENOENT;
- STRV_FOREACH(p, UNIT(s)->meta.manager->sysvinit_path) {
+ STRV_FOREACH(p, UNIT(s)->meta.manager->
lookup_paths.
sysvinit_path) {
char *path;
int r;
char *path;
int r;
@@
-726,7
+726,7
@@
static int service_load_sysv(Service *s) {
/* Load service data from SysV init scripts, preferably with
* LSB headers ... */
/* Load service data from SysV init scripts, preferably with
* LSB headers ... */
- if (strv_isempty(UNIT(s)->meta.manager->sysvinit_path))
+ if (strv_isempty(UNIT(s)->meta.manager->
lookup_paths.
sysvinit_path))
return 0;
if ((t = UNIT(s)->meta.id))
return 0;
if ((t = UNIT(s)->meta.id))
@@
-2201,7
+2201,7
@@
static int service_enumerate(Manager *m) {
assert(m);
assert(m);
- STRV_FOREACH(p, m->sysvrcnd_path)
+ STRV_FOREACH(p, m->
lookup_paths.
sysvrcnd_path)
for (i = 0; i < ELEMENTSOF(rcnd_table); i ++) {
struct dirent *de;
for (i = 0; i < ELEMENTSOF(rcnd_table); i ++) {
struct dirent *de;