diff options
| author | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2021-11-20 11:42:31 +0100 |
|---|---|---|
| committer | Luca Boccassi <luca.boccassi@gmail.com> | 2021-11-21 13:10:51 +0100 |
| commit | 0895e87348e5fc02f50498cad5922eb3eb172323 (patch) | |
| tree | 8eeea0cb21ee86b1fe9baf7c2e84be07b95f62b3 /LICENSE.GPL2 | |
| parent | Merge pull request #21432 from DaanDeMeyer/journal-trivial-fixes (diff) | |
| download | systemd-0895e87348e5fc02f50498cad5922eb3eb172323.tar.xz systemd-0895e87348e5fc02f50498cad5922eb3eb172323.zip | |
analyze: fix printing config when there is no main config file
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.
Diffstat (limited to 'LICENSE.GPL2')
0 files changed, 0 insertions, 0 deletions