summaryrefslogtreecommitdiff
path: root/src/core/load-dropin.h
diff options
context:
space:
mode:
authorZbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>2017-02-02 12:17:20 -0500
committerZbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>2017-02-02 12:17:20 -0500
commit17e78d1825bcc6cb9af25c9b1598ef32c82da6af (patch)
treec9afdf3f2dd2e2899975afed2a9684ad440ecfa9 /src/core/load-dropin.h
parent3ef21542b20bc62760a423aebeebb4c9e014131c (diff)
systemctl: also use chase_symlinks for dropins
The general rule is: - code in shared/ should take an "original_root" argument (possibly NULL) and pass it along down to chase_symlinks - code in core/ should always use specify original_root==NULL, since we don't support running the manager from non-root directory - code in systemctl and other tools should pass arg_root. For any code that is called from tools which support --root, chase_symlinks must be used to look up paths.
Diffstat (limited to 'src/core/load-dropin.h')
-rw-r--r--src/core/load-dropin.h3
1 files changed, 2 insertions, 1 deletions
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);