diff options
| author | Michael Marineau <michael.marineau@coreos.com> | 2014-03-14 05:32:12 +0100 |
|---|---|---|
| committer | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2014-03-14 14:31:34 +0100 |
| commit | 4cf7ea556aa1e74f9b34d4467f36d46a1bb25da3 (patch) | |
| tree | 78f02d17358dff9db9d00fa3aa27625dd552c2aa /src/modules-load/modules-load.c | |
| parent | Do not return -1 (EINVAL) on allocation error (diff) | |
| download | systemd-4cf7ea556aa1e74f9b34d4467f36d46a1bb25da3.tar.xz systemd-4cf7ea556aa1e74f9b34d4467f36d46a1bb25da3.zip | |
shared: add root argument to search_and_fopen
This adds the same root argument to search_and_fopen that
conf_files_list already has. Tools that use those two functions as a
pair can now be easily modified to load configuration files from an
alternate root filesystem tree.
Diffstat (limited to 'src/modules-load/modules-load.c')
| -rw-r--r-- | src/modules-load/modules-load.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/modules-load/modules-load.c b/src/modules-load/modules-load.c index 49b153d411..ecb84da6d7 100644 --- a/src/modules-load/modules-load.c +++ b/src/modules-load/modules-load.c @@ -145,7 +145,7 @@ static int apply_file(struct kmod_ctx *ctx, const char *path, bool ignore_enoent assert(ctx); assert(path); - r = search_and_fopen_nulstr(path, "re", conf_file_dirs, &f); + r = search_and_fopen_nulstr(path, "re", NULL, conf_file_dirs, &f); if (r < 0) { if (ignore_enoent && r == -ENOENT) return 0; |