diff options
| author | Lennart Poettering <lennart@poettering.net> | 2017-02-03 11:02:28 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-02-03 11:02:28 +0100 |
| commit | 5c1d991f4080497b0300943bd5b0f65e55cf550a (patch) | |
| tree | b37e7e444b21ce622d07129fca2b361d585229e0 /src/core | |
| parent | ce283b8887455408d5e3178fb6651eeb535d632f (diff) | |
| parent | 17e78d1825bcc6cb9af25c9b1598ef32c82da6af (diff) | |
Merge pull request #5213 from keszybz/systemctl-root-cat
Two fixes to path lookup when --root is used
Diffstat (limited to 'src/core')
| -rw-r--r-- | src/core/load-dropin.c | 6 | ||||
| -rw-r--r-- | src/core/load-dropin.h | 3 | ||||
| -rw-r--r-- | src/core/mount.c | 2 |
3 files changed, 7 insertions, 4 deletions
diff --git a/src/core/load-dropin.c b/src/core/load-dropin.c index f83fa09301..fc07151d37 100644 --- a/src/core/load-dropin.c +++ b/src/core/load-dropin.c @@ -57,9 +57,11 @@ int unit_load_dropin(Unit *u) { char **p; STRV_FOREACH(p, u->manager->lookup_paths.search_path) { - unit_file_process_dir(u->manager->unit_path_cache, *p, t, ".wants", UNIT_WANTS, + unit_file_process_dir(NULL, u->manager->unit_path_cache, *p, t, + ".wants", UNIT_WANTS, add_dependency_consumer, u, NULL); - unit_file_process_dir(u->manager->unit_path_cache, *p, t, ".requires", UNIT_REQUIRES, + unit_file_process_dir(NULL, u->manager->unit_path_cache, *p, t, + ".requires", UNIT_REQUIRES, add_dependency_consumer, u, NULL); } } diff --git a/src/core/load-dropin.h b/src/core/load-dropin.h index 942d26724e..319827dfb9 100644 --- a/src/core/load-dropin.h +++ b/src/core/load-dropin.h @@ -25,7 +25,8 @@ /* Read service data supplementary drop-in directories */ static inline int unit_find_dropin_paths(Unit *u, char ***paths) { - return unit_file_find_dropin_paths(u->manager->lookup_paths.search_path, + return unit_file_find_dropin_paths(NULL, + u->manager->lookup_paths.search_path, u->manager->unit_path_cache, u->names, paths); diff --git a/src/core/mount.c b/src/core/mount.c index f2e22f9562..ca0c4b0d5e 100644 --- a/src/core/mount.c +++ b/src/core/mount.c @@ -1241,7 +1241,7 @@ static void mount_sigchld_event(Unit *u, pid_t pid, int code, int status) { if (f == MOUNT_SUCCESS || m->from_proc_self_mountinfo) /* If /bin/mount returned success, or if we see the mount point in /proc/self/mountinfo we are - * happy. If we see the first condition first, we should see the the second condition + * happy. If we see the first condition first, we should see the second condition * immediately after – or /bin/mount lies to us and is broken. */ mount_enter_mounted(m, f); else |