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/systemctl | |
| 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/systemctl')
| -rw-r--r-- | src/systemctl/systemctl.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/systemctl/systemctl.c b/src/systemctl/systemctl.c index c28da50f41..2964b4e6b2 100644 --- a/src/systemctl/systemctl.c +++ b/src/systemctl/systemctl.c @@ -2484,7 +2484,7 @@ static int unit_file_find_path(LookupPaths *lp, const char *unit_name, char **un _cleanup_free_ char *path = NULL, *lpath = NULL; int r; - path = path_join(arg_root, *p, unit_name); + path = path_join(NULL, *p, unit_name); if (!path) return log_oom(); @@ -2601,7 +2601,7 @@ static int unit_find_paths( return log_error_errno(r, "Failed to add unit name: %m"); if (dropin_paths) { - r = unit_file_find_dropin_paths(lp->search_path, NULL, names, &dropins); + r = unit_file_find_dropin_paths(arg_root, lp->search_path, NULL, names, &dropins); if (r < 0) return r; } |