shaba/systemd
1
0
Fork 0
mirror of https://github.com/systemd/systemd.git synced 2025-03-31 14:50:15 +03:00
Code

analyze: fix printing config when there is no main config file

Browse Source 
Since 8b8024f1c231c166f5c450905c8fd91d11704ae7 and the follow-up commits, the
main config file may be located in /usr or in other paths. But the code in
analyze.c was still assuming that it must be in /etc. Things mostly worked for
our own config files because we usually install a comments-only file in /etc,
but was not correct in the general case.

This fixes in particular 'systemd-analyze cat-config systemd/zram-generator.conf'.
In Fedora we distribute a config file in zram-generator-defaults.rpm that is in
/usr/lib, and 'cat-config' would refuse to show it because
/etc/systemd/zram-generator.conf does not exist.

The main config file is optional, but let's print an informative message
because this is a slightly unusual case.

The file paths that we printed were missing the root prefix.
This commit is contained in:
Zbigniew Jędrzejewski-Szmek 2021-11-20 11:42:31 +01:00 committed by Luca Boccassi
parent 289a42304d
commit 0895e87348
1 changed files with 31 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
src/shared/pretty-print.c
View File

@ -304,24 +304,39 @@ int conf_files_cat(const char *root, const char *name) {
return log_error_errno(r, "Failed to build directory list: %m");
}
if (DEBUG_LOGGING) {
log_debug("Looking for configuration in:");
if (!is_collection)
STRV_FOREACH(prefix, prefixes)
log_debug(" %s%s%s", strempty(root), *prefix, name);
STRV_FOREACH(t, dirs)
log_debug(" %s%s/*%s", strempty(root), *t, extension);
}
/* First locate the main config file, if any */
if (!is_collection) {
STRV_FOREACH(prefix, prefixes) {
path = path_join(root, *prefix, name);
if (!path)
return log_oom();
if (access(path, F_OK) == 0)
break;
path = mfree(path);
}
if (!path)
printf("%s# Main configuration file %s not found%s\n",
ansi_highlight_magenta(),
name,
ansi_normal());
}
/* Then locate the drop-ins, if any */
r = conf_files_list_strv(&files, extension, root, 0, (const char* const*) dirs);
if (r < 0)
return log_error_errno(r, "Failed to query file list: %m");
if (!is_collection) {
path = path_join(root, "/etc", name);
if (!path)
return log_oom();
}
if (DEBUG_LOGGING) {
log_debug("Looking for configuration in:");
if (path)
log_debug(" %s", path);
STRV_FOREACH(t, dirs)
log_debug(" %s/*%s", *t, extension);
}
/* show */
return cat_files(path, files, CAT_FLAGS_MAIN_FILE_OPTIONAL);
/* Show */
return cat_files(path, files, 0);
}