picnoir
/
Systemd
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

tmpfiles: print error if basename lookup fails; document it in manpage

This commit is contained in:
Kay Sievers 2012-06-10 19:21:50 +02:00
parent 9125670f9a
commit ca2e894bdb
2 changed files with 16 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
man/systemd-tmpfiles.xml
View File

@ -67,9 +67,13 @@
<para>If invoked with no arguments, it applies all
directives from all configuration files. If one or
more absolute file names are passed on the command
line only the directives in these files are
applied.</para>
more file names are passed on the command line, only
the directives in these files are applied. If only
the basename of a configuration file is specified,
all configuration directories as specified in <citerefentry>
<refentrytitle>tmpfiles.d</refentrytitle>
<manvolnum>5</manvolnum>
</citerefentry> are searched for a matching file.</para>
</refsect1>
<refsect1>

10
src/tmpfiles/tmpfiles.c
View File

@ -1281,6 +1281,7 @@ static char *resolve_fragment(const char *fragment, const char **search_paths) {
free(resolved_path);
}
errno = ENOENT;
return NULL;
}
@ -1316,7 +1317,14 @@ int main(int argc, char *argv[]) {
int j;
for (j = optind; j < argc; j++) {
char *fragment = resolve_fragment(argv[j], conf_file_dirs);
char *fragment;
fragment = resolve_fragment(argv[j], conf_file_dirs);
if (!fragment) {
log_error("Failed to find any: %s file: %m", argv[j]);
r = EXIT_FAILURE;
goto finish;
}
if (read_config_file(fragment, false) < 0)
r = EXIT_FAILURE;
free(fragment);